Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

bin/OpenSimDefaults.ini

@@ -332,6 +332,26 @@
     DelayBeforeAppearanceSend = 2
 
 
+[RegionReady]
+    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
+    enabled = true
+
+    ; Channel on which to signal region readiness through a message
+    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
+    ; - the first field indicating whether this is an initial server startup
+    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
+    ; - the third field is a number indicating how many scripts failed to compile
+    ; - "oar error" if supplied, provides the error message from the OAR load
+    channel_notify = -800
+
+    ; - disallow logins while scripts are loading
+    ; Instability can occur on regions with 100+ scripts if users enter before they have finished loading
+    login_disable = true
+
+    ; - send an alert as json to a service
+    ; alert_uri = "http://myappserver.net/my_handler/"
+
+
 [SMTP]
     enabled = false
 
@@ -489,6 +509,7 @@
     ;
     ;DisableFacelights = "false"
 
+
 [ClientStack.LindenCaps]
 	;; Long list of capabilities taken from 
 	;; http://wiki.secondlife.com/wiki/Current_Sim_Capabilities
@@ -1098,15 +1119,18 @@
 
 [Economy]
     ; These economy values get used in the BetaGridLikeMoneyModule.  - This module is for demonstration only -
+    ; The default economy module only implements just enough to allow free actions (transfer of objects, etc).
+    ; There is no intention to implement anything further in core OpenSimulator.
+    ; This functionality has to be provided by third party modules.
 
-    ; Enables selling things for $0
-    SellEnabled = "false"
+    ;; Enables selling things for $0.  Default is true.
+    SellEnabled = true
 
-    ; Money Unit fee to upload textures, animations etc
-    PriceUpload = 0
+    ;; Money Unit fee to upload textures, animations etc.  Default is 0.
+    PriceUpload = 0 
 
-    ; Money Unit fee to create groups
-    PriceGroupCreate = 0
+    ;; Money Unit fee to create groups.  Default is 0.
+    PriceGroupCreate = 0 
 
     ; We don't really know what the rest of these values do.  These get sent to the client
     ; These taken from Agni at a Public Telehub.  Change at your own risk.
@@ -1301,24 +1325,6 @@
     broker = "http://broker.place.com/{1}"
 
 
-[RegionReady]
-    ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
-    ; default is false
-    enabled = false
-
-    ; Channel on which to signal region readiness through a message
-    ; formatted as follows: "{server_startup|oar_file_load},{0|1},n,[oar error]"
-    ; - the first field indicating whether this is an initial server startup
-    ; - the second field is a number indicating whether the OAR file loaded ok (1 == ok, 0 == error)
-    ; - the third field is a number indicating how many scripts failed to compile
-    ; - "oar error" if supplied, provides the error message from the OAR load
-    channel_notify = -800
-    ; - disallow logins while scripts are loading
-    login_disable = false
-    ; - send an alert as json to a service
-    ; alert_uri = "http://myappserver.net/my_handler/"
-
-
 [MRM]
     ; Enables the Mini Region Modules Script Engine.
     ; default is false