From 90722875e8518a6679441b0225ae2f11245bcfe0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 18 May 2012 03:44:31 +0100
Subject: Add millisecond logging to pCampBot for debugging purposes

---
 bin/pCampBot.exe.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index 3f19ee8..9cfb7e9 100644
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -8,7 +8,7 @@
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss.fff} - %message%newline" />
       </layout>
     </appender>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-- 
cgit v1.1


From c05f87b50c32c08818c291c76e46cb558083d35d Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 18 May 2012 17:47:00 -0400
Subject: Provide Telehub setting to allow use of landmarks

	Setting to allow use of landmarks to override telehub routing. Default is off.
---
 bin/OpenSim.ini.example | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9f418a4..aa29c07 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -249,6 +249,11 @@
     ;; "sequence" will place the avatar on the next sequential SpawnPoint
     ; SpawnPointRouting = closest
 
+    ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
+    ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true
+    ;; default is false
+    ; TelehubAllowLandmark = false
+
 [Estates]
     ; If these values are commented out then the user will be asked for estate details when required (this is the normal case).
   	; If these values are uncommented then they will be used to create a default estate as necessary.
-- 
cgit v1.1


From 9fa0577c7e4e710a5751c01b568b6453d513558e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 May 2012 00:00:52 +0100
Subject: Enable FetchInventoryDescendents2 and FetchInventory2 caps by
 default.  This appears to be required now for LL 3.3.1 to work properly.

Without this, LL 3.3.1 continually pushes LLInventoryModelFetchDescendentsResponder::error 499 to its log.
This cap will be ignored by older viewers - UDP inventory will work normally.
---
 bin/OpenSimDefaults.ini | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index cb9ef22..7962ef8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -601,13 +601,12 @@
     Cap_ViewerStartAuction = ""
     Cap_ViewerStats = ""
 
-    ; 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.
+    ; Capabilities for fetching inventory over HTTP rather than UDP
     ; FetchInventoryDescendents2 and FetchInventory2 are the ones used in the latest Linden Lab viewers (from some point in the v2 series and above)
+    ; It appears that Linden Lab viewer 3.3.1 onwards will not work properly if FetchInventoryDescendents2 and FetchInventory2 are not enabled
     Cap_WebFetchInventoryDescendents = ""
-    Cap_FetchInventoryDescendents2 = ""
-    Cap_FetchInventory2 = ""
+    Cap_FetchInventoryDescendents2 = "localhost"
+    Cap_FetchInventory2 = "localhost"
     
 
 [Chat]
-- 
cgit v1.1