aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-19 20:41:55 +0200
committerDiva Canto2010-08-19 21:33:09 -0700
commit37bd48c5a7502b78e26d7718b2da461e0a6ad4cb (patch)
tree8d5acf9207b17bcbc05c0d2b9a046bf8d1a34191
parentFinished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.c... (diff)
downloadopensim-SC_OLD-37bd48c5a7502b78e26d7718b2da461e0a6ad4cb.zip
opensim-SC_OLD-37bd48c5a7502b78e26d7718b2da461e0a6ad4cb.tar.gz
opensim-SC_OLD-37bd48c5a7502b78e26d7718b2da461e0a6ad4cb.tar.bz2
opensim-SC_OLD-37bd48c5a7502b78e26d7718b2da461e0a6ad4cb.tar.xz
Short-circuit the grid server lookup for RequestSimulatorData if the region
info is requested for is the local region
-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 0bdf664..f767c64 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8447,7 +8447,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8447 8447
8448 string reply = String.Empty; 8448 string reply = String.Empty;
8449 8449
8450 GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator); 8450 GridRegion info;
8451
8452 if (m_ScriptEngine.World.RegionInfo.RegionName == simulator)
8453 info = new GridRegion(m_ScriptEngine.World.RegionInfo);
8454 else
8455 info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
8451 8456
8452 switch (data) 8457 switch (data)
8453 { 8458 {