16 files changed, 67 insertions, 30 deletions

diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
new file mode 100644
index 0000000..1e3f042
--- /dev/null
+++ b/bin/BulletXNA.dll
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
new file mode 100644
index 0000000..4b83b83
--- /dev/null
+++ b/bin/BulletXNA.pdb
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
index a1a6382..9ca4631 100755
--- a/bin/Mono.Addins.CecilReflector.dll
+++ b/bin/Mono.Addins.CecilReflector.dll
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
index 8aa6d5f..75773aa 100755
--- a/bin/Mono.Addins.Setup.dll
+++ b/bin/Mono.Addins.Setup.dll
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index ea330fd..326ed1d 100755
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index b67da5f..f5423b2 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -1,5 +1,5 @@
 <configuration>
-    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet-2.1.5.0-dotnet-1.dylib" />
+    <dllmap os="osx" dll="openjpeg-dotnet.dll" target="lib64/libopenjpeg-dotnet.dylib" />
     <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="lib64/libopenjpeg-dotnet-x86_64" />
     <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="lib32/libopenjpeg-dotnet" />
 </configuration>
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index e3107ab..8a891f4 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -32,9 +32,15 @@
       <appender-ref ref="LogFileAppender" />
     </root>
 
+    <!-- Independently control logging level for XEngine -->
     <logger name="OpenSim.Region.ScriptEngine.XEngine">
       <level value="INFO"/>
     </logger>
 
+    <!-- Independently control logging level for per region module loading -->
+    <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
+      <level value="INFO"/>
+    </logger>
+
   </log4net>
 </configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 6757081..cc750a9 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -206,12 +206,13 @@
     ;; Choose one of the physics engines below
     ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
     ;; OpenDynamicsEngine is by some distance the most developed physics engine
-    ;; BulletSim is incomplete and experimental but in active development
+    ;; BulletSim is incomplete and experimental but in active development.  BulletSimN is a purely C# version of BulletSim.
     ;; basicphysics effectively does not model physics at all, making all
-    ;; objects phantom
+    ;; objects phantom.   
     ;; Default is OpenDynamicsEngine
     ; physics = OpenDynamicsEngine
     ; physics = BulletSim
+    ; physics = BulletSimN
     ; physics = basicphysics
     ; physics = POS
 
@@ -786,8 +787,9 @@
     ;; Allow the use of os* functions (some are dangerous)
     ; AllowOSFunctions = false
 
-    ;# {AllowLightShareFunctions} {Enabled:true [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} true
-    ; Allow the user of LightShare functions
+    ;# {AllowLightShareFunctions} {Enabled:false [LightShare]enable_windlight:true} {Allow LightShare functions?} {true false} false
+    ; Allow the use of LightShare functions.
+    ; The setting enable_windlight = true must also be enabled in the [LightShare] section.
     ; AllowLightShareFunctions = false
 
     ;# {OSFunctionThreatLevel} {Enabled:true AllowOSFunctions:true} {OSFunction threat level? (DANGEROUS!)} {None VeryLow Low Moderate High VeryHigh Severe} VeryLow
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54f252e..12474a7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -217,10 +217,10 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
-    ; Choose one of the physics engines below
-    ; OpenDynamicsEngine is by some distance the most developed physics engine
-    ; basicphysics effectively does not model physics at all, making all objects phantom
-
+    ; Choose one of the physics engines below.
+    ; OpenDynamicsEngine is by some distance the most developed physics engine.
+    ; BulletSim is a high performance, up-and-coming physics engine.
+    ; basicphysics effectively does not model physics at all, making all objects phantom.
     physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
@@ -364,6 +364,12 @@
     ; alert_uri = "http://myappserver.net/my_handler/"
 
 
+[EstateManagement]
+    ; If false, then block any region restart requests from the client even if they are otherwise valid.
+    ; Default is true
+    AllowRegionRestartFromClient = true
+
+
 [SMTP]
     enabled = false
 
@@ -898,17 +904,20 @@
 
 [BulletSim]
     ; World parameters
-    DefaultFriction = 0.50
+    DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
     Gravity = -9.80665
 
-    TerrainFriction = 0.50
-    TerrainHitFriction = 0.8
+    TerrainFriction = 0.30
+    TerrainHitFraction = 0.8
     TerrainRestitution = 0
+    TerrainCollisionMargin = 0.04
+
     AvatarFriction = 0.2
+    AvatarStandingFriction = 10.0
     AvatarRestitution = 0.0
-    AvatarDensity = 60.0
+    AvatarDensity = 3.5
     AvatarCapsuleWidth = 0.6
     AvatarCapsuleDepth = 0.45
     AvatarCapsuleHeight = 1.5
@@ -920,27 +929,15 @@
     LinearDamping = 0.0
     AngularDamping = 0.0
     DeactivationTime = 0.2
-    LinearSleepingThreshold = 0.8
-    AngularSleepingThreshold = 1.0
-    CcdMotionThreshold = 0.0
-    CcdSweptSphereRadius = 0.0
-    ContactProcessingThreshold = 0.1
-    ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
-    MaxPersistantManifoldPoolSize = 0
-    ShouldDisableContactPoolDynamicAllocation = False
-    ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = True
-    ShouldSplitSimulationIslands = True
-    ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0   
+    CollisionMargin = 0.04
 
     ; Linkset constraint parameters
+    LinkImplementation = 1      ; 0=constraint, 1=compound
     LinkConstraintUseFrameOffset = False
     LinkConstraintEnableTransMotor = True
     LinkConstraintTransMotorMaxVel = 5.0
     LinkConstraintTransMotorMaxForce = 0.1
 
-
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
 
@@ -1367,6 +1364,10 @@
     ; If a script overruns it's event limit, kill the script?
     KillTimedOutScripts = false
 
+    ; Amount of time in milliseconds we will wait for an event to completely normally when a script stop is requested
+    ; before aborting the thread (such as when an object containing scripts is taken into inventory).
+    WaitForEventCompletionOnScriptStop = 1000;
+
     ; Sets the multiplier for the scripting delays
     ScriptDelayFactor = 1.0
 
@@ -1582,8 +1583,7 @@
 
     ; If true, then the basic packet objects used to receive data are also recycled, not just the LLUDP packets.
     ; This reduces data churn
-    ; This setting is currently experimental and defaults to false.
-    RecycleBaseUDPPackets = false;
+    RecycleBaseUDPPackets = true
 
 
 [InterestManagement]
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 4ecc6b0..c7d4b7f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -22,6 +22,18 @@
 ; *
 [Startup]
 
+; Plugin Registry Location
+; Set path to directory for plugin registry. Information
+; about the registered repositories and installed plugins
+; will be stored here
+; The Robust.exe process must hvae R/W access to the location 
+RegistryLocation = "."
+
+; Modular configurations
+; Set path to directory for modular ini files...
+; The Robust.exe process must hvae R/W access to the location 
+ConfigDirectory = "/home/opensim/etc/Configs"
+
 [ServiceList]
 
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
@@ -53,7 +65,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
 ;; Additions for other add-on modules. For example:
 ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
 
-
 ; * This is common for all services, it's the network setup for the entire
 ; * server instance, if none is specified above
 ; *
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 7503c5e..bc5cbcc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -14,6 +14,19 @@
 ; *
 [Startup]
 
+; Plugin Registry Location
+; Set path to directory for plugin registry. Information
+; about the registered repositories and installed plugins
+; will be stored here
+; The Robust.exe process must hvae R/W access to the location 
+RegistryLocation = "."
+
+
+; Modular configurations
+; Set path to directory for modular ini files...
+; The Robust.exe process must hvae R/W access to the location 
+ConfigDirectory = "/home/opensim/etc/Configs"
+
 [ServiceList]
 AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
 InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 79f7ed6..e53fcca 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,11 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+        ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+        ;; and available when they return. True by default.
+        ;RestrictInventoryAccessAbroad = True
+
+
 [HGAssetService]
     ;
     ; === HG ONLY ===
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 2ae1c75..b01896e 100755
--- a/bin/lib32/BulletSim.dll
+++ b/bin/lib32/BulletSim.dll
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index d4852a5..d964c11 100755
--- a/bin/lib32/libBulletSim.so
+++ b/bin/lib32/libBulletSim.so
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 77cf7e3..20eed6a 100755
--- a/bin/lib64/BulletSim.dll
+++ b/bin/lib64/BulletSim.dll
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 4ec62b2..5bb28ed 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so