Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

3 files changed, 64 insertions, 34 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
index 37d81a3..8df89ad 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -147,8 +147,13 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
         {
             base.AgentHasMovedAway(sp, logout);
             if (logout)
+            {
+                // Reset the map
+                ResetMap(sp);
+
                 // Log them out of this grid
                 m_aScene.PresenceService.LogoutAgent(sp.ControllingClient.SessionId);
+            }
         }
 
         protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason, out bool logout)
@@ -280,6 +285,27 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
         }
 
+        protected void ResetMap(ScenePresence sp)
+        {
+            List<GridRegion> regions = m_Scenes[0].GridService.GetRegionRange(m_Scenes[0].RegionInfo.ScopeID, 0, 17000 * (int)Constants.RegionSize, 0, 17000 * (int)Constants.RegionSize);
+            m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Resetting {0} tiles on the map", regions.Count);
+            if (regions != null)
+            {
+                List<MapBlockData> mapBlocks = new List<MapBlockData>();
+                foreach (GridRegion r in regions)
+                {
+                    MapBlockData mblock = new MapBlockData();
+                    mblock.X = (ushort)(r.RegionLocX / Constants.RegionSize);
+                    mblock.Y = (ushort)(r.RegionLocY / Constants.RegionSize);
+                    mblock.Name = "";
+                    mblock.Access = 254; // means 'simulator is offline'. We need this because the viewer ignores 255's
+                    mblock.MapImageId = UUID.Zero;
+                    mapBlocks.Add(mblock);
+                }
+                sp.ControllingClient.SendMapBlock(mapBlocks, 0);
+            }
+
+        }
 
         #endregion
 
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index f066f83..fd2cc20 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -59,44 +59,44 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         #endregion
 
-        protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
-        {
-            List<MapBlockData> mapBlocks = new List<MapBlockData>();
-            List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                minX * (int)Constants.RegionSize, maxX * (int)Constants.RegionSize, 
-                minY * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize);
+        //protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag)
+        //{
+        //    List<MapBlockData> mapBlocks = new List<MapBlockData>();
+        //    List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
+        //        minX * (int)Constants.RegionSize, maxX * (int)Constants.RegionSize, 
+        //        minY * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize);
 
-            foreach (GridRegion r in regions)
-            {
-                uint x = 0, y = 0;
-                long handle = 0;
-                if (r.RegionSecret != null && r.RegionSecret != string.Empty)
-                {
-                    if (long.TryParse(r.RegionSecret, out handle))
-                    {
-                        Utils.LongToUInts((ulong)handle, out x, out y);
-                        x = x / Constants.RegionSize;
-                        y = y / Constants.RegionSize;
-                    }
-                }
+        //    foreach (GridRegion r in regions)
+        //    {
+        //        uint x = 0, y = 0;
+        //        long handle = 0;
+        //        if (r.RegionSecret != null && r.RegionSecret != string.Empty)
+        //        {
+        //            if (long.TryParse(r.RegionSecret, out handle))
+        //            {
+        //                Utils.LongToUInts((ulong)handle, out x, out y);
+        //                x = x / Constants.RegionSize;
+        //                y = y / Constants.RegionSize;
+        //            }
+        //        }
 
-                if (handle == 0 || 
-                    // Check the distance from the current region
-                    (handle != 0 && Math.Abs((int)(x - m_scene.RegionInfo.RegionLocX)) < 4096 && Math.Abs((int)(y - m_scene.RegionInfo.RegionLocY)) < 4096))
-                {
-                    MapBlockData block = new MapBlockData();
-                    MapBlockFromGridRegion(block, r);
-                    mapBlocks.Add(block);
-                }
-            }
+        //        if (handle == 0 || 
+        //            // Check the distance from the current region
+        //            (handle != 0 && Math.Abs((int)(x - m_scene.RegionInfo.RegionLocX)) < 4096 && Math.Abs((int)(y - m_scene.RegionInfo.RegionLocY)) < 4096))
+        //        {
+        //            MapBlockData block = new MapBlockData();
+        //            MapBlockFromGridRegion(block, r);
+        //            mapBlocks.Add(block);
+        //        }
+        //    }
 
-            // Different from super
-            FillInMap(mapBlocks, minX, minY, maxX, maxY);
-            //
+        //    // Different from super
+        //    //FillInMap(mapBlocks, minX, minY, maxX, maxY);
+        //    //
 
-            remoteClient.SendMapBlock(mapBlocks, 0);
+        //    remoteClient.SendMapBlock(mapBlocks, 0);
 
-        }
+        //}
 
 
         private void FillInMap(List<MapBlockData> mapBlocks, int minX, int minY, int maxX, int maxY)
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index f89b824..99b2d84 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -303,7 +303,11 @@ namespace OpenSim.Region.Physics.Meshing
                     if (meshOsd is OSDMap)
                     {
                         OSDMap map = (OSDMap)meshOsd;
-                        OSDMap physicsParms = (OSDMap)map["physics_shape"];
+                        OSDMap physicsParms = (OSDMap)map["physics_shape"]; // old asset format
+
+                        if (physicsParms.Count == 0)
+                            physicsParms = (OSDMap)map["physics_mesh"]; // new asset format
+
                         int physOffset = physicsParms["offset"].AsInteger() + (int)start;
                         int physSize = physicsParms["size"].AsInteger();