aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-06-24 19:49:05 +0100
committerJustin Clark-Casey (justincc)2011-06-24 19:49:05 +0100
commitde20f0603fa419ba16c56d16c2ad55301cad8b83 (patch)
treed93ef87605cc632744ec21f8fb6ea035e083e1c0 /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-de20f0603fa419ba16c56d16c2ad55301cad8b83.zip
opensim-SC-de20f0603fa419ba16c56d16c2ad55301cad8b83.tar.gz
opensim-SC-de20f0603fa419ba16c56d16c2ad55301cad8b83.tar.bz2
opensim-SC-de20f0603fa419ba16c56d16c2ad55301cad8b83.tar.xz
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.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSimDefaults.ini4
-rw-r--r--bin/config-include/StandaloneCommon.ini.example3
2 files changed, 4 insertions, 3 deletions
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 @@
504 ; Distance in meters that shouts should travel. Default is 100m 504 ; Distance in meters that shouts should travel. Default is 100m
505 shout_distance = 100 505 shout_distance = 100
506 506
507[EntityTransfer]
508 ; The maximum distance in regions that an agent is allowed to teleport along the x or y axis
509 ; This is set to 4095 because current viewers can't handle teleports that are greater than this distance
510 max_distance = 4095
507 511
508[Messaging] 512[Messaging]
509 ; Control which region module is used for instant messaging. 513 ; 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 @@
63 ;;--- For MySql region storage (alternative) 63 ;;--- For MySql region storage (alternative)
64 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData" 64 ;StorageProvider = "OpenSim.Data.MySQL.dll:MySqlRegionData"
65 65
66 ;; With hypergrid, perform distance check for the creation of a linked region
67 ; Check4096 = true
68
69 ;; Directory for map tile images of remote regions 66 ;; Directory for map tile images of remote regions
70 ; MapTileDirectory = "./maptiles" 67 ; MapTileDirectory = "./maptiles"
71 68