From b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Nov 2011 22:19:57 +0000
Subject: remove some mono compiler warnings

---
 bin/OpenSimDefaults.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 5fe1352..ebd734d 100644
--- a/bin/OpenSimDefaults.ini
+++ b/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 
@@ -722,7 +721,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.
 
-- 
cgit v1.1


From 676d32974adc913b2902db6cfa456c77bd52cd85 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 25 Nov 2011 22:46:42 +0000
Subject: Implement the FetchInventoryDescendents2 capability using the same
 code as WebFetchInventoryDescendents.

Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
---
 bin/OpenSimDefaults.ini | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ebd734d..972efe4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -573,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.
-- 
cgit v1.1