aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-19 20:41:55 +0200
committerMelanie Thielker2010-08-19 20:41:55 +0200
commita1074cad5c6da38a67f79e3498574c5a7e0d3dbb (patch)
treee1555357ec986ff9f1a5b41d462bf76400fe6b53 /OpenSim/Region
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-a1074cad5c6da38a67f79e3498574c5a7e0d3dbb.zip
opensim-SC-a1074cad5c6da38a67f79e3498574c5a7e0d3dbb.tar.gz
opensim-SC-a1074cad5c6da38a67f79e3498574c5a7e0d3dbb.tar.bz2
opensim-SC-a1074cad5c6da38a67f79e3498574c5a7e0d3dbb.tar.xz
Short-circuit the grid server lookup for RequestSimulatorData if the region
info is requested for is the local region
Diffstat (limited to '')
-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 97dd2e1..22a81ac 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9147,7 +9147,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9147 9147
9148 string reply = String.Empty; 9148 string reply = String.Empty;
9149 9149
9150 GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator); 9150 GridRegion info;
9151
9152 if (m_ScriptEngine.World.RegionInfo.RegionName == simulator)
9153 info = new GridRegion(m_ScriptEngine.World.RegionInfo);
9154 else
9155 info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
9151 9156
9152 switch (data) 9157 switch (data)
9153 { 9158 {