3 files changed, 23 insertions, 3 deletions

diff --git a/bin/IronMath.dll b/bin/IronMath.dll
deleted file mode 100644
index 4960cc6..0000000
--- a/bin/IronMath.dll
+++ /dev/null
diff --git a/bin/IronPython.dll b/bin/IronPython.dll
deleted file mode 100644
index 2efe7ef..0000000
--- a/bin/IronPython.dll
+++ /dev/null
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f9d9ca6..04cf8e8 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
@@ -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
@@ -597,6 +597,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
     ; ##
@@ -822,6 +825,12 @@
     ; default is 1000
     cloud_update_rate = 1000
 
+[Meta7Windlight]
+
+    ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
+    ; It has no ill effect on viewers which do not support server-side windlight settings.
+    ; Currently we only have support for MySQL databases.
+    enable_windlight = false;
 
 [Trees]
     ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
@@ -971,6 +980,9 @@
 
     ; Allow the use of os* functions (some are dangerous)
     AllowOSFunctions = false
+    
+    ; Allow the user of Careminster functions
+    AllowCareminsterFunctions = false
 
     ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
     OSFunctionThreatLevel = VeryLow
@@ -1155,7 +1167,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
@@ -1296,6 +1307,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