Merge branch 'master' into careminster-presence-refactor

1 files changed, 31 insertions, 26 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 98bb355..60d37fb 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -78,20 +78,19 @@
     ; DrawPrimOnMapTile = true
 
     ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
-    ;; Maximum size for non-physical prims
+    ;; Maximum size for non-physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     ; NonPhysicalPrimMax = 256
 
     ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
-    ;; Maximum size where a prim can be physical
+    ;; Maximum size where a prim can be physical.  Affects resizing of existing prims.  This can be overriden in the region config file.
     ; PhysicalPrimMax = 10
 
-    ;; Prevent the creation, import and rez of prims that exceed the
-    ;; maximum size.
+    ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
+    ;; This can be overriden in the region config file.
     ; ClampPrimSize = false
 
     ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} false
-    ;; Allow scripts to cross region boundaries. These are recompiled on the
-    ;; new region.
+    ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  Script code is recompiled on the destination region and the state reloaded.
     ; AllowScriptCrossing = false
 
     ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
@@ -173,7 +172,7 @@
     ;; permission checks (allowing anybody to copy
     ;; any item, etc.  This may not yet be implemented uniformally.
     ;; If set to true, then all permissions checks are carried out
-    ; serverside_object_permissions = false
+    ; serverside_object_permissions = true
 
     ;; This allows users with a UserLevel of 200 or more to assume god
     ;; powers in the regions in this simulator.
@@ -292,28 +291,31 @@
     ;; building's lights to possibly not be rendered.
     ; DisableFacelights = "false"
 
+
 [ClientStack.LindenCaps]
-        ;; For the long list of capabilities, see OpenSimDefaults.ini
-        ;; Here are the few ones you may want to change. Possible values
-        ;; are:
-        ;;   "" -- empty, capability disabled
-        ;;   "localhost" -- capability enabled and served by the simulator
-        ;;   "<url>" -- capability enabled and served by some other server
-        ;;
-        ; These are enabled by default to localhost. Change if you see fit.
-    Cap_GetTexture = "localhost"
-        Cap_GetMesh = "localhost"
-        ; This is disabled by default. Change if you see fit. Note that
-        ; serving this cap from the simulators may lead to poor performace.
-        Cap_WebFetchInventoryDescendents = ""
+    ;; For the long list of capabilities, see OpenSimDefaults.ini
+    ;; Here are the few ones you may want to change. Possible values
+    ;; are:
+    ;;   "" -- empty, capability disabled
+    ;;   "localhost" -- capability enabled and served by the simulator
+    ;;   "<url>" -- capability enabled and served by some other server
+    ;;
+    ; These are enabled by default to localhost. Change if you see fit.
+      Cap_GetTexture = "localhost"
+    Cap_GetMesh = "localhost"
+    ; This is disabled by default. Change if you see fit. Note that
+    ; serving this cap from the simulators may lead to poor performace.
+    Cap_WebFetchInventoryDescendents = ""
+
 
 [SimulatorFeatures]
-        ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers 
-        ; meant to override the MapImage and search server url given at login, and varying 
-        ; on a sim-basis.
-        ; Viewers that don't understand it, will ignore it
-        ;MapImageServerURI = "http://127.0.0.1:9000/
-        ;SearchServerURI = "http://127.0.0.1:9000/
+    ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers 
+    ; meant to override the MapImage and search server url given at login, and varying 
+    ; on a sim-basis.
+    ; Viewers that don't understand it, will ignore it
+    ;MapImageServerURI = "http://127.0.0.1:9000/
+    ;SearchServerURI = "http://127.0.0.1:9000/
+
 
 [Chat]
     ;# {whisper_distance} {} {Distance at which a whisper is heard, in meters?} {} 10
@@ -650,6 +652,7 @@
     ;; If using a remote connector, specify the server URL
     ; FreeswitchServiceURL = http://my.grid.server:8004/fsapi
 
+
 [Groups]
     ;# {Enabled} {} {Enable groups?} {true false} false
     ;; Enables the groups module
@@ -707,11 +710,13 @@
     ;; Enable media on a prim facilities
     ; Enabled = true;
 
+
 [PrimLimitsModule]
     ;# {EnforcePrimLimits} {} {Enforce parcel prim limits} {true false} false
     ;; Enable parcel prim limits.  Off by default to emulate pre-existing behavior.
     ; EnforcePrimLimits = false
 
+
 [Architecture]
     ;# {Include-Architecture} {} {Choose one of the following architectures} {config-include/Standalone.ini config-include/StandaloneHypergrid.ini config-include/Grid.ini config-include/GridHypergrid.ini config-include/SimianGrid.ini config-include/HyperSimianGrid.ini} config-include/Standalone.ini
     ;; Uncomment one of the following includes as required.  For instance, to create a standalone OpenSim,