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 ++++ 1 file changed, 4 insertions(+) (limited to 'bin/OpenSimDefaults.ini') 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. -- 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/OpenSimDefaults.ini') 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/OpenSimDefaults.ini') 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 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/OpenSimDefaults.ini | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'bin/OpenSimDefaults.ini') 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