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


From 781db43a7665cf0c219889e85eadd7cdc4e8b79b Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Thu, 3 Dec 2009 20:21:10 -0500
Subject: * Fixes the 10x10x10 hard physics limitation.   (wierdly, you have to
 set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
 * Adds a configurable maximum object mass before the mass is clamped. 
 Default is 10000.01.  Configurable by changing maximum_mass_object in the
 [ODEPhysicsSettings] section. * Clamping the mass is important for limiting
 the amount of CPU an object can consume in physics calculations.  Too high,
 and the object overcomes restitution forces by gravity alone. This generates
 more collisions potentially leading to 'deep think'.

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

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3accee0..8efbcb4 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -594,6 +594,9 @@
     body_motor_joint_maxforce_tensor_linux = 5
     body_motor_joint_maxforce_tensor_win = 5
 
+    ; Maximum mass an object can be before it is clamped
+    maximum_mass_object = 10000.01
+
     ; ##
     ; ## Sculpted Prim settings
     ; ##
-- 
cgit v1.1


From 07786786fcdc93e01286ccd15aaf539d2579a329 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Thu, 3 Dec 2009 20:30:40 -0500
Subject: * Clarifies that the PrimMaxPhys in OpenSim.ini.example does nothing.
  Tells user to set it in Regions.ini.   Melanie might want to take a look at
 this and see if it should be removed altogether.

---
 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 8efbcb4..4351b3f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -91,7 +91,7 @@
 
     ; Maximum total size, and maximum size where a prim can be physical
     NonPhysicalPrimMax = 256
-    PhysicalPrimMax = 10
+    PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
     ClampPrimSize = false
 
     ; Region crossing
-- 
cgit v1.1