aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-08-19 19:55:03 -0700
committerDiva Canto2010-08-19 19:55:03 -0700
commitb4e7c62fbced3a3cc002c7868437df381d51db36 (patch)
treeb1f8b19b67c376e11388b551d4895768bbabc34c /OpenSim
parentFinished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.c... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-b4e7c62fbced3a3cc002c7868437df381d51db36.zip
opensim-SC_OLD-b4e7c62fbced3a3cc002c7868437df381d51db36.tar.gz
opensim-SC_OLD-b4e7c62fbced3a3cc002c7868437df381d51db36.tar.bz2
opensim-SC_OLD-b4e7c62fbced3a3cc002c7868437df381d51db36.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d38fe9f..b6eddb1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8720,7 +8720,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8720 8720
8721 string reply = String.Empty; 8721 string reply = String.Empty;
8722 8722
8723 GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator); 8723 GridRegion info;
8724
8725 if (m_ScriptEngine.World.RegionInfo.RegionName == simulator)
8726 info = new GridRegion(m_ScriptEngine.World.RegionInfo);
8727 else
8728 info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
8724 8729
8725 switch (data) 8730 switch (data)
8726 { 8731 {