Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

bin/OpenSimDefaults.ini

@@ -507,8 +507,7 @@
     ; silly vanity "Facelights" dead. Sorry, head mounted miner's lamps
     ; will also be affected.
     ;
-    ;DisableFacelights = "false"
-
+    ;DisableFacelights = "false(1815)
 
 [ClientStack.LindenCaps]
 	;; Long list of capabilities taken from 
@@ -574,11 +573,14 @@
     Cap_UploadObjectAsset = "localhost"
     Cap_ViewerStartAuction = ""
     Cap_ViewerStats = ""
-	; This last one is supported by OpenSim, but may
-	; lead to poor sim performance if served by the simulators,
-	; so it is disabled by default.
-    Cap_WebFetchInventoryDescendents = ""
 
+	  ; 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)
+    Cap_WebFetchInventoryDescendents = ""
+    Cap_FetchInventoryDescendents2 = ""
+    
 
 [Chat]
     ; Controls whether the chat module is enabled.  Default is true.
@@ -722,7 +724,8 @@
     av_density = 80
 
     ; use this value to cut 52% of the height the sim gives us
-    av_height_fudge_factor = 0.52
+    ; Currently unused
+    ; av_height_fudge_factor = 0.52
 
     ; Movement.  Smaller is faster.