Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 16 insertions, 14 deletions

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