From de20f0603fa419ba16c56d16c2ad55301cad8b83 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 24 Jun 2011 19:49:05 +0100 Subject: Tell hypergridders when their teleports fail because of the 4096 limit rather than just saying "destination not found" Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module This allows us to explicitly tell the hypergridder why the teleport failed (region out of range). It also allows people on regions that are within range (on a large source grid) to teleport. The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased. The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding. --- bin/OpenSimDefaults.ini | 4 ++++ bin/config-include/StandaloneCommon.ini.example | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index fa5392d..7321cad 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -504,6 +504,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. 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" -- cgit v1.1 From 0dd3281caf09090e86036d67a34939b0e31c1b16 Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Tue, 21 Jun 2011 12:43:44 +0300 Subject: Optionally, don't delete previously compiled scripts on startup --- bin/OpenSimDefaults.ini | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 7321cad..db4836a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -1124,6 +1124,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.. -- cgit v1.1 From 698cd0b3c2b9827cfbb83df5c587b7740238a2bb Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 25 Jun 2011 01:33:09 +0100 Subject: Remove the now unused [cms] section from OpenSimDefaults.ini --- bin/OpenSimDefaults.ini | 5 ----- 1 file changed, 5 deletions(-) (limited to 'bin') diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index db4836a..57db852 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -859,11 +859,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] -- cgit v1.1 From e11c959400380ff7ef05e972ed6f730efa7a6f48 Mon Sep 17 00:00:00 2001 From: Makopoppo Date: Mon, 27 Jun 2011 22:28:33 +0900 Subject: [PATCH] Changed Wind parameters default value in OpenSim.ini.example according to implementation Signed-off-by: BlueWall --- bin/OpenSim.ini.example | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bab118f..98bb355 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -443,8 +443,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 -- cgit v1.1 From 03feb50a72a44f988f9d4d551f3c5656bbe1fe10 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 30 Jun 2011 20:26:17 +0100 Subject: minor: adjust some indentation and spacing in OpenSim.ini.example for consistency --- bin/OpenSim.ini.example | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 98bb355..df4e60b 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -292,28 +292,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 - ;; "" -- 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 + ;; "" -- 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 +653,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 +711,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, -- cgit v1.1 From a9b7487fcb657bf50d69a522fb9dfb37d547f347 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 30 Jun 2011 22:36:22 +0100 Subject: improve and tidy up some config file comments --- bin/OpenSim.ini.example | 11 +++++------ bin/OpenSimDefaults.ini | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index df4e60b..a4f243d 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 diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 57db852..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 -- cgit v1.1 From fba961c63f2168eb560eec84b66203b1a875b952 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 1 Jul 2011 23:06:46 +0100 Subject: Make default serverside_object_permissions = true since this better matches user expectations. It also matches the default setting in the OpenSim.ini.example file --- 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 a4f243d..60d37fb 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -172,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. -- cgit v1.1 From bebc51a6e041d2bcd8fef110ea5b178ac614c59d Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 4 Jul 2011 22:51:47 +0100 Subject: Make it possible to disable the file part of the flotsam asset cache This matches the ability to disable the memory part This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini Default is true, so existing installations are not affected. Improved fcache command feedback when various caches are disabled. Re-enabled test for flotsam cache with file caching disabled. --- bin/config-include/FlotsamCache.ini.example | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bin') 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 -- cgit v1.1 From 2fbc98fa5c518d549768899573fa506a22f529e6 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 7 Jul 2011 23:37:23 +0100 Subject: Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap) --- bin/addon-modules/README | 1 - 1 file changed, 1 deletion(-) delete mode 100644 bin/addon-modules/README (limited to 'bin') 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 -- cgit v1.1