Fixed the bug that makes a region use its water height as its name (in regionhandshake), which lead to most regions being called "20". (applied fix to sugilite)

Rearranged some of the methods in ClientView.API.

1 files changed, 3 insertions, 29 deletions

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 035eb4c..c8961b6 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -145,8 +145,9 @@ namespace OpenSim
             return true;

         }

 

-        public void RequestMapLayer() //should be getting the map layer from the grid server

+        public void RequestMapLayer()

         {

+            //should be getting the map layer from the grid server

             //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)

             MapLayerReplyPacket mapReply = new MapLayerReplyPacket();

             mapReply.AgentData.AgentID = this.AgentID;

@@ -190,33 +191,6 @@ namespace OpenSim
             this.OutPacket(mbReply);

         }

 

-        protected PrimData CreatePrimFromObjectAdd(ObjectAddPacket addPacket)

-        {

-            PrimData PData = new PrimData();

-            PData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

-            PData.PCode = addPacket.ObjectData.PCode;

-            PData.PathBegin = addPacket.ObjectData.PathBegin;

-            PData.PathEnd = addPacket.ObjectData.PathEnd;

-            PData.PathScaleX = addPacket.ObjectData.PathScaleX;

-            PData.PathScaleY = addPacket.ObjectData.PathScaleY;

-            PData.PathShearX = addPacket.ObjectData.PathShearX;

-            PData.PathShearY = addPacket.ObjectData.PathShearY;

-            PData.PathSkew = addPacket.ObjectData.PathSkew;

-            PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;

-            PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;

-            PData.Scale = addPacket.ObjectData.Scale;

-            PData.PathCurve = addPacket.ObjectData.PathCurve;

-            PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;

-            PData.ParentID = 0;

-            PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;

-            PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;

-            PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;

-            PData.PathTaperX = addPacket.ObjectData.PathTaperX;

-            PData.PathTaperY = addPacket.ObjectData.PathTaperY;

-            PData.PathTwist = addPacket.ObjectData.PathTwist;

-            PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;

-

-            return PData;

-        }

+       

     }

 }