10 files changed, 66 insertions, 24 deletions

diff --git a/bin/BulletSim-x86_64.dll b/bin/BulletSim-x86_64.dll
index 6620759..ec21dfe 100755
--- a/bin/BulletSim-x86_64.dll
+++ b/bin/BulletSim-x86_64.dll
diff --git a/bin/BulletSim.dll b/bin/BulletSim.dll
index ffb5380..d1571cf 100755
--- a/bin/BulletSim.dll
+++ b/bin/BulletSim.dll
diff --git a/bin/OpenSim.Tests.Torture.dll.config b/bin/OpenSim.Tests.Torture.dll.config
new file mode 100644
index 0000000..a3f681d
--- /dev/null
+++ b/bin/OpenSim.Tests.Torture.dll.config
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+  </configSections>
+  <runtime>
+      <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+          <dependentAssembly>
+              <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" /> 
+              <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" /> 
+              <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" /> 
+              <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" /> 
+          </dependentAssembly>
+      </assemblyBinding>
+  </runtime>
+  <log4net>
+    <!-- A1 is set to be a ConsoleAppender -->
+    <appender name="A1" type="log4net.Appender.ConsoleAppender">
+      
+        <!-- A1 uses PatternLayout -->
+        <layout type="log4net.Layout.PatternLayout">
+          <!-- Print the date in ISO 8601 format -->
+          <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
+        </layout>
+    </appender>
+    
+    <!-- Set root logger level to DEBUG and its only appender to A1 -->
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="A1" />
+    </root>
+  </log4net>
+</configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d4e61a5..f9b405d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -36,6 +36,7 @@
 
 
 [Startup]
+
     ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
     ;; Console prompt
     ;; Certain special characters can be used to customize the prompt
@@ -170,9 +171,9 @@
     ; physics = basicphysics
     ; physics = POS
 
-    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by space} {} DefaultPermissionsModule
-    ;; Permission modules to use, separated by space.
-    ; permissionmodules = "DefaultPermissionsModule"
+    ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule
+    ;; Permission modules to use, separated by comma.
+    ; permissionmodules = DefaultPermissionsModule
 
     ;# {serverside_object_permissions} {permissionmodules:DefaultPermissionsModule} {Activate permission handling by the sim?} {true false} true
     ;; These are the parameters for the default permissions module
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 3e7f8a6..3935c92 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -515,16 +515,16 @@
     ;DisableFacelights = "false(1815)
 
 [ClientStack.LindenCaps]
-        ;; Long list of capabilities taken from 
-        ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
-        ;; Not all are supported by OpenSim. The ones supported are
-        ;; set to localhost. These defaults can be overwritten
-        ;; in OpenSim.ini
-        ;;
-        Cap_AttachmentResources = ""
+    ;; Long list of capabilities taken from 
+    ;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
+    ;; Not all are supported by OpenSim. The ones supported are
+    ;; set to localhost. These defaults can be overwritten
+    ;; in OpenSim.ini
+    ;;
+    Cap_AttachmentResources = ""
     Cap_AvatarPickerSearch = ""
     Cap_ChatSessionRequest = ""
-    Cap_CopyInventoryFromNotecard = ""
+    Cap_CopyInventoryFromNotecard = "localhost"
     Cap_DispatchRegionInfo = ""
     Cap_EstateChangeInfo = ""
     Cap_EventQueueGet = "localhost"
@@ -579,12 +579,13 @@
     Cap_ViewerStartAuction = ""
     Cap_ViewerStats = ""
 
-          ; The fetch inventory descendents caps are supported by OpenSim, but may
-          ; lead to poor sim performance if served by the simulators,
-          ; so they are disabled by default.
-    ; FetchInventoryDescendents2 is the one used in the latest Linden Lab viewers (from some point in the v2 series and above)
+    ; The various fetch inventory caps are supported by OpenSim, but may
+    ; lead to poor sim performance if served by the simulators,
+    ; so they are currently disabled by default.
+    ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
     Cap_WebFetchInventoryDescendents = ""
     Cap_FetchInventoryDescendents2 = ""
+    Cap_FetchInventory2 = ""
     
 
 [Chat]
@@ -841,8 +842,9 @@
     DeactivationTime = 0.2
     LinearSleepingThreshold = 0.8
     AngularSleepingThreshold = 1.0
-    CcdMotionThreshold = 0.5
-    CcdSweptSphereRadius = 0.2
+    CcdMotionThreshold = 0.0
+    CcdSweptSphereRadius = 0.0
+    ContactProcessingThreshold = 0.1
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 49ee41a..ab5880d 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -251,7 +251,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     SRV_HomeURI = "http://127.0.0.1:8002"
     SRV_InventoryServerURI = "http://127.0.0.1:8002"
     SRV_AssetServerURI = "http://127.0.0.1:8002"
-    SRV_ProfileServerURI = "http://127.0.0.1:8002/user"
+    SRV_ProfileServerURI = "http://127.0.0.1:8002"
     SRV_FriendsServerURI = "http://127.0.0.1:8002"
     SRV_IMServerURI = "http://127.0.0.1:8002"
 
@@ -380,7 +380,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; For the InventoryServiceInConnector
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInventoryService"
         UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-        ProfileServerURI = "http://127.0.0.1:8002/user"
+        HomeURI = "http://127.0.0.1:8002"
 
 ; * The interface that local users get when they are in other grids.
 ; * This restricts the access that the rest of the world has to
@@ -389,7 +389,7 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 [HGAssetService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGAssetService"
     UserAccountsService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
-    ProfileServerURI = "http://127.0.0.1:8002/user"
+    HomeURI = "http://127.0.0.1:8002"
 
 [HGFriendsService]
     LocalServiceModule = "OpenSim.Services.FriendsService.dll:FriendsService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e368249..4195bce 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -58,6 +58,12 @@
     ;
     InventoryServerURI = "http://mygridserver.com:8003"
 
+[GridInfo]
+   ;
+   ; Change this to your grid info service
+   ;
+   GridInfoURI = "http://mygridserver.com:8002"
+
 [GridService]
     ;
     ; Change this to your grid-wide grid server
@@ -123,7 +129,7 @@
     ; Change this to your server 
     ; accessible from other grids
     ;
-    ProfileServerURI = "http://mygridserver.com:8002/user"
+    HomeURI = "http://mygridserver.com:8002"
     Gatekeeper = "http://mygridserver.com:8002"
     ;; If you want to protect your assets from being copied by foreign visitors
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 84611ec..2f39218 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -48,13 +48,13 @@
     AssetLoaderArgs = "assets/AssetSets.xml"
 
 [HGInventoryService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGAssetService]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
 
 [HGInventoryAccessModule]
-    ProfileServerURI = "http://127.0.0.1:9000/profiles"
+    HomeURI = "http://127.0.0.1:9000"
         Gatekeeper = "http://127.0.0.1:9000"
 
     ;; If you want to protect your assets from being copied by foreign visitors
diff --git a/bin/libBulletSim-x86_64.so b/bin/libBulletSim-x86_64.so
index cd2db40..527eda5 100755
--- a/bin/libBulletSim-x86_64.so
+++ b/bin/libBulletSim-x86_64.so
diff --git a/bin/libBulletSim.so b/bin/libBulletSim.so
index 44afb5e..9f91bfd 100755
--- a/bin/libBulletSim.so
+++ b/bin/libBulletSim.so