This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Traceback (most recent call last): | |
File "/usr/local/lib/python2.6/dist-packages/django/core/servers/basehttp.py", line 283, in run | |
self.result = application(self.environ, self.start_response) | |
File "/usr/local/lib/python2.6/dist-packages/django/contrib/staticfiles/handlers.py", line 68, in __call__ | |
return self.application(environ, start_response) | |
File "/usr/local/lib/python2.6/dist-packages/django/core/handlers/wsgi.py", line 272, in __call__ | |
response = self.get_response(request) | |
File "/usr/local/lib/python2.6/dist-packages/django/core/handlers/base.py", line 169, in get_response | |
response = self.handle_uncaught_exception(request, resolver, sys.exc_info()) | |
File "/usr/local/lib/python2.6/dist-packages/django/core/handlers/base.py", line 111, in get_response |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[2012-02-14 12:06:43,033: ERROR/MainProcess] Task celery_tasks.import_upload.place_upload[f66700e8-34b5-4abc-ab6c-f5f0a30bb6a6] raised exception: TypeError("cannot concatenate 'str' and 'NoneType' objects",) | |
Traceback (most recent call last): | |
File "/usr/local/lib/python2.6/dist-packages/celery/execute/trace.py", line 150, in trace_task | |
R = retval = task(*args, **kwargs) | |
File "/home/ewencp/sirikata-cdn.git/sirikata-cdn/celery_tasks/import_upload.py", line 207, in place_upload | |
(collada_obj, subfile_data, image_objs) = get_collada_and_images(zip, dae_zip_name, dae_data, subfiles, subfile_getter=eph_subfile_getter) | |
File "/home/ewencp/sirikata-cdn.git/sirikata-cdn/celery_tasks/import_upload.py", line 108, in get_collada_and_images | |
col = coll.Collada(StringIO(dae_data)) | |
File "/usr/local/lib/python2.6/dist-packages/collada/__init__.py", line 204, in __init__ | |
self._loadEffects() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
REM This entire upper block is for determining where Visual Studio is. Search for TOPDIR for the real code (after a big empty block) | |
@SET VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0 | |
@SET VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC | |
@SET FrameworkDir=C:\WINDOWS\Microsoft.NET\Framework | |
@SET FrameworkVersion=v2.0.50727 | |
@SET Framework35Version=v3.5 | |
@if "%VSINSTALLDIR%"=="" goto error_no_VSINSTALLDIR | |
@if "%VCINSTALLDIR%"=="" goto error_no_VCINSTALLDIR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
v8::Object::Set(obj, key, value) | |
v8::Object* => v8::internal::JSObject** (MAKE_OPEN_HANDLE api.h, this is the external -> internal mapping, that same file also seems to have a macro for internal -> external mapping) | |
v8::internal::SetProperty(i::Object obj, i::Object key, i::Object val, flags) | |
implemented handles.cc:268 | |
CALL_HEAP_FUNCTION(isolate, i::Object::SetProperty()) | |
=> JSObject inherits from JSReceiver | |
JSReceiver::SetProperty objects.cc:1964 -> objects.cc:2619 | |
=> JSObject::SetPropertyForResult | |
=> SetNormalizedProperty ( for normal, non-global, etc) | |
=> JSObject::properties_dictionary() => JSObject::properties() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/Root.cpp b/src/Root.cpp | |
index 37f9833..13d161e 100644 | |
--- a/src/Root.cpp | |
+++ b/src/Root.cpp | |
@@ -469,6 +469,12 @@ bool Root::init(FileString homeDirectory, FileString subprocessDirectory) { | |
g_browser_process->resource_dispatcher_host()); | |
mDefaultRequestContext=mProf->GetRequestContext(); | |
+ | |
+ g_browser_process->InitDevToolsHttpProtocolHandler( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/liboh/src/HostedObject.cpp b/liboh/src/HostedObject.cpp | |
index a3c6cbb..c115be6 100644 | |
--- a/liboh/src/HostedObject.cpp | |
+++ b/liboh/src/HostedObject.cpp | |
@@ -926,6 +926,10 @@ void HostedObject::handleProximityMessage(const SpaceObjectReference& spaceobj, | |
); | |
} | |
} | |
+ ProxyManagerPtr proxy_manager = self->getProxyManager(spaceobj.space(),spaceobj.object()); | |
+ std::vector<SpaceObjectReference> obj_refs; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/sirikata-cdn/content/views.py b/sirikata-cdn/content/views.py | |
index c4d808d..9479974 100644 | |
--- a/sirikata-cdn/content/views.py | |
+++ b/sirikata-cdn/content/views.py | |
@@ -555,7 +555,7 @@ def search(request): | |
return render_to_response('content/search.html', view_params, context_instance = RequestContext(request)) | |
def search_json(request): | |
- query = request.GET.get('q', '') | |
+ query = request.REQUEST.get('q', '') |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
{ | |
"app" : { | |
"name" : "demo", | |
"directory" : "demo" | |
}, | |
"binary" : { | |
"name" : "cppoh", | |
"args" : { | |
"object-factory-opts" : "--db=avatar.db" | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GCC_VERSION=`gcc --version | grep ^gcc | cut -d " " -f 4` | |
GCC_VERSION_MAJOR=`gcc --version | grep ^gcc | cut -d " " -f 4 | cut -d "." -f 1` | |
GCC_VERSION_MINOR=`gcc --version | grep ^gcc | cut -d " " -f 4 | cut -d "." -f 2` | |
GCC_VERSION_REV=`gcc --version | grep ^gcc | cut -d " " -f 4 | cut -d "." -f 3` | |
if [ "${GCC_VERSION_MAJOR}" -gt "4" -o "${GCC_VERSION_MAJOR}" -eq "4" -a "${GCC_VERSION_MINOR}" -ge "6" ]; then | |
GCC_46_FIX_CXXFLAGS="-Wno-conversion-null -Wno-unused-but-set-variable -Wno-unused-result -Wno-int-to-pointer-cast" | |
else | |
GCC_46_FIX_CXXFLAGS="" | |
fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
# See https://docs.google.com/Doc?id=dgmmft5s_45hr7hmggr for details on how this script was put together | |
sudo apt-get install -y build-essential libapr1-dev libconfuse-dev libexpat1-dev python-dev libpcre3-dev librrd2-dev apache2 php5-mysql libapache2-mod-php5 rrdtool | |
mkdir ganglia | |
cd ganglia | |
wget -O ganglia-3.1.7.tar.gz "http://downloads.sourceforge.net/project/ganglia/ganglia%20monitoring%20core/3.1.7/ganglia-3.1.7.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fganglia%2Ffiles%2Fganglia%2520monitoring%2520core%2F&ts=1288907147&use_mirror=softlayer" |