10 files changed, 53 insertions, 29 deletions

diff --git a/bin/MsgPack.dll b/bin/MsgPack.dll
new file mode 100755
index 0000000..90e6b7b
--- /dev/null
+++ b/bin/MsgPack.dll
diff --git a/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
new file mode 100644
index 0000000..c72c281
--- /dev/null
+++ b/bin/OpenSim.Region.PhysicsModule.ubOde.dll.config
@@ -0,0 +1,7 @@
+<configuration>
+  <dllmap os="osx" dll="ode" target="lib64/libode.dylib" />
+  <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="lib64/libode-x86_64" />
+  <dllmap os="!windows,osx" cpu="x86" dll="ode" target="lib32/libode" />
+  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="lib64/libode-ppc64" />
+  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="lib64/libode-s390x" />
+</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f5268bd..323a1e9 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -142,10 +142,6 @@
     ;; from the selected region_info_source.
     ; allow_regionless = false
 
-    ;# {MaxPrimUndos} {} {Maximum number of undos avialable for position, rotation and scale changes of each prim} {} 20
-    ;; Increasing the number of undos available number will increase memory usage.
-    MaxPrimUndos = 20
-
     ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001
     ;; Minimum size for non-physical prims.  Affects resizing of existing 
     ;; prims.  This can be overridden in the region config file (as 
@@ -248,7 +244,9 @@
     ;; Default is Meshmerizer
     ; meshing = Meshmerizer
     ; meshing = ZeroMesher
-
+        ;; select ubODEMeshmerizer only with ubOde physics engine
+    ; meshing = ubODEMeshmerizer
+        
     ;; Choose one of the physics engines below
     ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} BulletSim
     ;; BulletSim is the default physics engine.  It provides the best performance and most functionality.
@@ -261,6 +259,8 @@
     ; physics = BulletSim
     ; physics = basicphysics
     ; physics = POS
+        ;; alternative OpenDynamicsEngine engine. ubODEMeshmerizer meshing above MUST be selected also
+        ; physics = ubODE
 
     ;# {DefaultScriptEngine} {} {Default script engine} {XEngine} XEngine
     ;; Default script engine to use. Currently, we only have XEngine
@@ -696,7 +696,6 @@
     ;; (see NINJA Physics, http://opensimulator.org/wiki/NINJA_Physics)
     ; use_NINJA_physics_joints = false
 
-
 [RemoteAdmin]
     ;; This is the remote admin module, which uses XMLRPC requests to
     ;; manage regions from a web interface.
@@ -1115,6 +1114,20 @@
 [NPC]
     ;# {Enabled} {} {Enable Non Player Character (NPC) facilities} {true false} false
     ; Enabled = false
+        
+        ;; several options to control NPCs creation
+        
+        ;; allow NPCs to be created not Owned {true false} default: true
+    ; AllowNotOwned = false
+        
+        ;; allow NPCs to set to be sensed as Avatars {true false} default: true
+    ; AllowSenseAsAvatar = false
+        
+        ;; allow NPCs to created cloning any avatar in region {true false} default: true
+    ; AllowCloneOtherAvatars = false
+        
+        ;; if true NPCs will have no group title, if false display "- NPC -" for easy identification {true false} default: true
+    ; NoNPCGroup = false 
 
 
 [Terrain]
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 636069d..d6955c3 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -591,7 +591,7 @@
     ; clients login by starting each connection more slowly. Disabled by
     ; default
     ;
-    enable_adaptive_throttles = true
+    enable_adaptive_throttles = false
 
     ; Per-client bytes per second rates for the various throttle categories.
     ; These are default values that will be overridden by clients. These
@@ -893,16 +893,16 @@
     ; World Step size. (warning these are dangerous.  Changing these will probably cause your scene to explode dramatically)
     ; reference: fps = (0.089/ODE_STEPSIZE) * 1000;
     world_stepsize = 0.0178
-    world_internal_steps_without_collisions = 10
+        ; number of iterations of constrains solver, higher should improve results up to a point, but taking more time. No real gain in more than default
+    world_solver_iterations = 10
 
-    ;World Space settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
-    world_hashspace_size_low = -4
-    world_hashSpace_size_high = 128
+    ;Spaces level settings. Affects memory consumption vs Collider CPU time for avatar and physical prim
+        ; defines spaces partition cells min and max sizes == 2^value
+    world_hashspace_level_low = -5
+    world_hashSpace_level_high = 12
 
-    ;Dynamic space settings Affects memory consumption vs Collider CPU time for static prim
     meters_in_small_space = 29.9
-    small_hashspace_size_low = -4
-    small_hashspace_size_high = 66
+ 
 
     ; ##
     ; ## Contact properties. (the stuff that happens when things come in contact with each other)
@@ -941,18 +941,14 @@
     ; desired velocity
     ; See http://en.wikipedia.org/wiki/PID_controller
 
-    av_pid_derivative_linux = 2200.0
-    av_pid_proportional_linux = 900.0;
-
-    av_pid_derivative_win = 2200.0
-    av_pid_proportional_win = 900.0;
+    av_pid_derivative = 2200.0
+    av_pid_proportional = 900.0;
 
     ;girth of the avatar.  Adds radius to the height also
     av_capsule_radius = 0.37
 
     ; Max force permissible to use to keep the avatar standing up straight
-    av_capsule_standup_tensor_win = 550000
-    av_capsule_standup_tensor_linux = 550000
+    av_capsule_standup_tensor = 550000
 
     ; specifies if the capsule should be tilted (=true; old compatibility mode)
     ; or straight up-and-down (=false; better and more consistent physics behavior)
@@ -1004,19 +1000,12 @@
     ; maximum number of contact points to generate per collision
     contacts_per_collision = 80
 
-    ; amount of time a geom/body will try to cross a region border before it gets disabled
-    geom_crossing_failures_before_outofbounds = 5
-
     ; start throttling the object updates if object comes in contact with 3 or more other objects
     geom_contactpoints_start_throttling = 3
 
     ; send 1 update for every x updates below when throttled
     geom_updates_before_throttled_update = 15
 
-    ; Used for llSetStatus.  How rigid the object rotation is held on the axis specified
-    body_motor_joint_maxforce_tensor_linux = 5
-    body_motor_joint_maxforce_tensor_win = 5
-
     ; Maximum mass an object can be before it is clamped
     maximum_mass_object = 10000.01
 
@@ -1922,7 +1911,7 @@
     GroupsCacheTimeout = 30
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
-    MessagingModule = GroupsMessagingModule
+    ;MessagingModule = GroupsMessagingModule
     ;MessagingEnabled = true 
 
     ; Experimental option to only message cached online users rather than all users
diff --git a/bin/assets/TexturesAssetSet/defaultalpha.jp2 b/bin/assets/TexturesAssetSet/defaultalpha.jp2
new file mode 100644
index 0000000..af73c1e
--- /dev/null
+++ b/bin/assets/TexturesAssetSet/defaultalpha.jp2
diff --git a/bin/enter_uuid.xml b/bin/enter_uuid.xml
new file mode 100644
index 0000000..84475ad
--- /dev/null
+++ b/bin/enter_uuid.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="100" name="enter_uuid" title="ID Required" width="390">
+        <text bottom="-30" left="10">Enter UUID</text>
+        <line_editor bottom="-60" left="10" width="370" name="new_owner" height="20"/>
+        <button bottom="-90" width="80" height="20" left="300" label="OK" name="ok" />
+        <button bottom="-90" width="80" height="20" left="210" label="Cancel" name="cancel" />
+</floater>
diff --git a/bin/lib32/libode.so b/bin/lib32/libode.so
index 6bb85fb..5b110ae 100644..100755
--- a/bin/lib32/libode.so
+++ b/bin/lib32/libode.so
diff --git a/bin/lib32/ode.dll b/bin/lib32/ode.dll
index f310358..8457e50 100755
--- a/bin/lib32/ode.dll
+++ b/bin/lib32/ode.dll
diff --git a/bin/lib64/ode.dll b/bin/lib64/ode.dll
index df3a6c4..f47ae31 100755
--- a/bin/lib64/ode.dll
+++ b/bin/lib64/ode.dll
diff --git a/bin/set_object_owner.xml b/bin/set_object_owner.xml
new file mode 100644
index 0000000..6d9bb8a
--- /dev/null
+++ b/bin/set_object_owner.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="100" name="set_owner_name" title="Set Owner Name" width="390">
+        <text bottom="-30" left="10">New Owner Name</text>
+        <line_editor enabled="false" bottom="-60" left="10" width="280" name="new_owner" height="20"/>
+        <button bottom_delta="0" left="300" height="20" width="80" label="Choose" name="picker"/>
+        <button bottom="-90" width="80" height="20" left="300" label="OK" name="ok" />
+        <button bottom="-90" width="80" height="20" left="210" label="Cancel" name="cancel" />
+</floater>