Merge branch 'master' into httptests

2 files changed, 6 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 74888b3..3482270 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -256,6 +256,10 @@
         ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
         ; physics = ubODE
 
+    ; ubODE and  OpenDynamicsEngine does allocate a lot of memory on stack. On linux you may need to increase its limit
+    ; script opensim-ode-sh starts opensim setting that limit. You may need to increase it even more on large regions
+    ; edit the line ulimit -s 262144, and change this last value
+    
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use. Currently, we only have XEngine
     ; DefaultScriptEngine = "XEngine"
diff --git a/bin/opensim-ode.sh b/bin/opensim-ode.sh
index b901425..7c61571 100755
--- a/bin/opensim-ode.sh
+++ b/bin/opensim-ode.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-echo "Starting OpenSimulator with ODE.  If you get an error saying limit: Operation not permitted.  Then you will need to chmod 0600 /etc/limits"
+echo "Starting OpenSimulator with ODE or ubOde.  If you get an error saying limit: Operation not permitted.  Then you will need to chmod 0600 /etc/limits"
 ulimit -s 262144
-mono OpenSim.exe -physics=OpenDynamicsEngine
+mono OpenSim.exe