From 22fdd7b1f161411e17871411846e22f43abbbed6 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 19 Aug 2010 20:41:55 +0200
Subject: Short-circuit the grid server lookup for RequestSimulatorData if the
 region info is requested for is the local region

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

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
 
                 string reply = String.Empty;
 
-                GridRegion info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
+                GridRegion info;
+
+                if (m_ScriptEngine.World.RegionInfo.RegionName == simulator)
+                    info = new GridRegion(m_ScriptEngine.World.RegionInfo);
+                else
+                    info = m_ScriptEngine.World.GridService.GetRegionByName(m_ScriptEngine.World.RegionInfo.ScopeID, simulator);
 
                 switch (data)
                 {
-- 
cgit v1.1