From 87c88ff7028673744d7eaa805a0206066c920437 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 30 Nov 2009 18:06:10 +0000
Subject: enable messaging_server_url by default in OpenSim.ini.example having
 this enabled results just in warning messages if no message service is
 actually available haivng this disabled results in an unexpected failure if
 no message service is available

---
 bin/OpenSim.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 116a8fd..dadc560 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -342,7 +342,7 @@
 
     ; The MessagingServer is a companion of the UserServer. It uses
     ; user_send_key and user_recv_key, too
-    ;messaging_server_url = "http://127.0.0.1:8006"
+    messaging_server_url = "http://127.0.0.1:8006"
 
     ; What is reported as the "X-Secondlife-Shard"
     ; Defaults to the user server url if not set
-- 
cgit v1.1


From 17136724e2bc9529c9f8269c05402ab531d5f82d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 30 Nov 2009 18:35:57 +0000
Subject: minor: add disabled config and explanation for WebStats

---
 bin/OpenSim.ini.example | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index dadc560..3accee0 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1152,7 +1152,6 @@
     safemode = false
 
 [VivoxVoice]
-
     ; The VivoxVoice module will allow you to provide voice on your
     ; region(s). It uses the same voice technology as the LL grid and
     ; works with recent LL clients (we have tested 1.22.9.110075, so
@@ -1293,6 +1292,15 @@
      RootReprioritizationDistance = 10.0
      ChildReprioritizationDistance = 20.0
 
+
+[WebStats]
+; View region statistics via a web page
+; See http://opensimulator.org/wiki/FAQ#Region_Statistics_on_a_Web_Page 
+; Use a web browser and type in the "Login URI" + "/SStats/"
+; For example- http://127.0.0.1:9000/SStats/
+; enabled=false
+
+
 ;;
 ;; These are defaults that are overwritten below in [Architecture].
 ;; These defaults allow OpenSim to work out of the box with
-- 
cgit v1.1


From 85f7e4a6ab33b1dbc65b4f287da4ec3542ff4220 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 1 Dec 2009 14:03:06 +0000
Subject: Remove leftover IronPython DLLs This completes
 http://opensimulator.org/mantis/view.php?id=4395

---
 bin/IronMath.dll   | Bin 45056 -> 0 bytes
 bin/IronPython.dll | Bin 1605632 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bin/IronMath.dll
 delete mode 100644 bin/IronPython.dll

(limited to 'bin')

diff --git a/bin/IronMath.dll b/bin/IronMath.dll
deleted file mode 100644
index 4960cc6..0000000
Binary files a/bin/IronMath.dll and /dev/null differ
diff --git a/bin/IronPython.dll b/bin/IronPython.dll
deleted file mode 100644
index 2efe7ef..0000000
Binary files a/bin/IronPython.dll and /dev/null differ
-- 
cgit v1.1