Merge pull request #53 from holoneon/patch-7

Update MapSearchModule.cs

OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs

@@ -130,14 +130,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
                 //m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
 
-                MapBlockData data;
                 if (regionInfos != null && regionInfos.Count > 0)
                 {
                     foreach (GridRegion info in regionInfos)
                     {
-                        data = new MapBlockData();
-                        data.Agents = 0;
-                        data.Access = info.Access;
                         MapBlockData block = new MapBlockData();
                         MapBlockFromGridRegion(block, info, flags);
 

OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                 m_regionGlobalX = scene.RegionInfo.WorldLocX;
                 m_regionGlobalY = scene.RegionInfo.WorldLocY;
                 m_regionSizeX = scene.RegionInfo.RegionSizeX;
-                m_regionSizeY = scene.RegionInfo.RegionSizeX;
+                m_regionSizeY = scene.RegionInfo.RegionSizeY;
                 m_regionName = scene.RegionInfo.RegionName;
 
                 m_scene.RegisterModuleInterface<IWorldMapModule>(this);

OpenSim/Region/ScriptEngine/YEngine/XMRInstRun.cs

@@ -318,6 +318,9 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     m_LastRanAt = now;
                     m_InstEHSlice++;
                     callMode = CallMode_NORMAL;
+                    // The script really executes here, so it has meaningful
+                    // state to serialize — GetXMLState gates on this flag.
+                    m_HasRun = true;
                     e = ResumeEx();
                 }
 
@@ -393,6 +396,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
                     m_DetectParams = evt.DetectParams;
                     m_LastRanAt = now;
                     m_InstEHEvent++;
+                    // Starting a new event handler counts as "has run".
+                    m_HasRun = true;
                     e = StartEventHandler(evc, evt.Params);
                 }