Merge branch 'master' into bulletsim

5 files changed, 62 insertions, 46 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bab118f..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
@@ -443,8 +445,8 @@
     ;; to ConfigurableWind and uncomment the following.
     ; avg_strength = 5.0
     ; avg_direction = 0.0
-    ; var_strength = 0.0
-    ; var_direction = 0.0
+    ; var_strength = 5.0
+    ; var_direction = 30.0
     ; rate_change = 1.0
 
     ;# {strength} {enabled:true wind_plugin:SimpleRandomWind} {Wind strength?} {} 1.0
@@ -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,
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa5392d..400d3df 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -14,10 +14,13 @@
     ; Place to create a PID file
     ; PIDFile = "/tmp/my.pid"
 
+    ; Console commands run at startup
     startup_console_commands_file = "startup_commands.txt"
+
+    ; Console commands run on shutdown
     shutdown_console_commands_file = "shutdown_commands.txt"
 
-    ; To run a script every few minutes, set the script filename here
+    ; Console commands run every 20 minutes
     ; timer_Script = "filename"
 
     ; ##
@@ -70,12 +73,17 @@
     ; Use terrain texture for maptiles if true, use shaded green if false
     TextureOnMapTile = false
 
-    ; Maximum total size, and maximum size where a prim can be physical
+    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonphysicalPrimMax!).
     NonPhysicalPrimMax = 256
-    PhysicalPrimMax = 10 ; (I think this was moved to the Regions.ini!)
+
+    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
+    PhysicalPrimMax = 10
+
+    ; 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
 
-    ; 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
 
     ; Allow compiled script binary code to cross region boundaries.
@@ -94,7 +102,7 @@
     ; neighbors on each side for a total of 49 regions in view. Warning, unless
     ; all the regions have the same drawdistance, you will end up with strange
     ; effects because the agents that get closed may be inconsistent.
-    ; DefaultDrawDistance = 255.0
+    DefaultDrawDistance = 255.0
 
     ; If you have only one region in an instance, or to avoid the many bugs
     ; that you can trigger in modules by restarting a region, set this to
@@ -102,7 +110,7 @@
     ; This is meant to be used on systems where some external system like
     ; Monit will restart any instance that exits, thereby making the shutdown
     ; into a restart.
-    ;InworldRestartShutsDown = false
+    InworldRestartShutsDown = false
 
     ; ##
     ; ## PRIM STORAGE
@@ -227,7 +235,6 @@
 
     ; If enabled, enableFlySlow will change the primary fly state to
     ; FLYSLOW, and the "always run" state will be the regular fly.
-
     enableflyslow = false
 
     ; PreJump is an additional animation state, but it probably
@@ -236,7 +243,6 @@
 
     ; This is commented so it will come on automatically once it's
     ; supported.
-
     ; enableprejump = true
 
     ; Simulator Stats URI
@@ -265,6 +271,7 @@
     DelayBeforeAppearanceSave = 5
     DelayBeforeAppearanceSend = 2
 
+
 [SMTP]
     enabled=false
 
@@ -504,6 +511,10 @@
     ; Distance in meters that shouts should travel.  Default is 100m
     shout_distance = 100
 
+[EntityTransfer]
+    ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
+    ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
+    max_distance = 4095
 
 [Messaging]
     ; Control which region module is used for instant messaging.
@@ -855,11 +866,6 @@
     ;exclude_list=User 1,User 2,User 3
 
 
-[CMS]
-    enabled = false
-    ;channel = 345
-
-
 ; The following settings control the progression of daytime
 ; in the Sim.  The defaults are the same as the commented out settings
 [Sun]
@@ -1120,6 +1126,12 @@
     ;; Path to script assemblies 
     ; ScriptEnginesPath = "ScriptEngines"
 
+    ; Whether to delete previously compiled scripts when the sim starts. If you disable this
+    ; then startup will be faster. However, then it becomes your responsibility to delete the
+    ; compiled scripts if OpenSim has changed enough that previously compiled scripts are no
+    ; longer compatible.
+    DeleteScriptsOnStartup = true 
+
 
 [OpenGridProtocol]
     ;These are the settings for the Open Grid Protocol..  the Agent Domain, Region Domain,   you know..
diff --git a/bin/addon-modules/README b/bin/addon-modules/README
deleted file mode 100644
index 120dbc9..0000000
--- a/bin/addon-modules/README
+++ /dev/null
@@ -1 +0,0 @@
-Place .ini files here to have them picked up automatically
diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example
index ad38ad1..cd39f8c 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/bin/config-include/FlotsamCache.ini.example
@@ -19,9 +19,12 @@
     ; 0 to disable
     HitRateDisplay = 100
 
-    ; Set to false for disk cache only.
+    ; Set to false for no memory cache
     MemoryCacheEnabled = false
 
+    ; Set to false for no file cache
+    FileCacheEnabled = true
+
     ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
     ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
     ; increases performance without large memory impact
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index cbe3fa0..ee0523f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -63,9 +63,6 @@
     ;;--- For MySql region storage (alternative)
     ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
 
-    ;; With hypergrid, perform distance check for the creation of a linked region
-    ; Check4096 = true
-
     ;; Directory for map tile images of remote regions
     ; MapTileDirectory = "./maptiles"