diff options
| author | opensim mirror account | 2010-11-16 08:20:04 -0800 |
|---|---|---|
| committer | opensim mirror account | 2010-11-16 08:20:04 -0800 |
| commit | 63171839a30943c9c5baa0e81ad09679e74200f6 (patch) | |
| tree | f8bcfb102198c099180a3fa49fb4ba8810a62115 | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Fix osTeleportAgent for hypergrid destinations. (diff) | |
| download | opensim-SC_OLD-63171839a30943c9c5baa0e81ad09679e74200f6.zip opensim-SC_OLD-63171839a30943c9c5baa0e81ad09679e74200f6.tar.gz opensim-SC_OLD-63171839a30943c9c5baa0e81ad09679e74200f6.tar.bz2 opensim-SC_OLD-63171839a30943c9c5baa0e81ad09679e74200f6.tar.xz | |
Merge branch 'master' of /var/git/opensim/
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 0b787d8..e6a323e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -665,7 +665,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 665 | if (regions != null && regions.Count > 0) | 665 | if (regions != null && regions.Count > 0) |
| 666 | { | 666 | { |
| 667 | GridRegion regInfo = regions[0]; | 667 | GridRegion regInfo = regions[0]; |
| 668 | regionName = regInfo.RegionName; | 668 | string[] parts = regInfo.RegionName.Split(new char[] { ':' }); |
| 669 | if (parts.Length > 2) | ||
| 670 | regionName = parts[2]; | ||
| 671 | else | ||
| 672 | regionName = parts[0]; | ||
| 669 | } | 673 | } |
| 670 | } | 674 | } |
| 671 | World.RequestTeleportLocation(presence.ControllingClient, regionName, | 675 | World.RequestTeleportLocation(presence.ControllingClient, regionName, |