From 3658015de8f614b99f116b2971957307f0960c55 Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 9 Jun 2007 11:13:02 +0000
Subject: Number of small changes.

---
 OpenSim/OpenSim.RegionServer/ClientView.API.cs     | 40 ++++++++++++++++++++++
 .../ClientView.ProcessPackets.cs                   | 18 ++++++++--
 2 files changed, 55 insertions(+), 3 deletions(-)

(limited to 'OpenSim/OpenSim.RegionServer')

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index a6e5317..9e0cd48 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -98,6 +98,46 @@ namespace OpenSim
         /// <summary>
         /// 
         /// </summary>
+        /// <param name="regionInfo"></param>
+        public void SendRegionHandshake(RegionInfo regionInfo)
+        {
+            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
+            RegionHandshakePacket handshake = new RegionHandshakePacket();
+
+            handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
+            handshake.RegionInfo.IsEstateManager = false;
+            handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
+            handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
+            handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
+            handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
+            handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
+            handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
+            handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
+            handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
+            handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
+            handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
+
+
+            handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
+
+            handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.estateSettings.waterHeight + "\0");
+            handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
+            handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
+            handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
+            handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
+            handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
+            handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
+            handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
+            handshake.RegionInfo.TerrainDetail2 =regionInfo.estateSettings.terrainDetail2;
+            handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
+            handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
+
+            this.OutPacket(handshake);
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
         /// <param name="regInfo"></param>
         public void MoveAgentIntoRegion(RegionInfo regInfo)
         {
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 8b94a82..d36e579 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -457,19 +457,31 @@ namespace OpenSim
                     #region Parcel related packets
                     case PacketType.ParcelPropertiesRequest:
                         ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
+                        if(OnParcelPropertiesRequest != null)
+                        {
                         OnParcelPropertiesRequest((int)Math.Round(propertiesRequest.ParcelData.West), (int)Math.Round(propertiesRequest.ParcelData.South), (int)Math.Round(propertiesRequest.ParcelData.East), (int)Math.Round(propertiesRequest.ParcelData.North), propertiesRequest.ParcelData.SequenceID, propertiesRequest.ParcelData.SnapSelection, this);
+                        }
                         break;
                     case PacketType.ParcelDivide:
                         ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
-                        OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
+                        if (OnParcelDivideRequest != null)
+                        {
+                            OnParcelDivideRequest((int)Math.Round(parcelDivide.ParcelData.West), (int)Math.Round(parcelDivide.ParcelData.South), (int)Math.Round(parcelDivide.ParcelData.East), (int)Math.Round(parcelDivide.ParcelData.North), this);
+                        }
                         break;
                     case PacketType.ParcelJoin:
                         ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
-                        OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
+                        if (OnParcelJoinRequest != null)
+                        {
+                            OnParcelJoinRequest((int)Math.Round(parcelJoin.ParcelData.West), (int)Math.Round(parcelJoin.ParcelData.South), (int)Math.Round(parcelJoin.ParcelData.East), (int)Math.Round(parcelJoin.ParcelData.North), this);
+                        }
                         break;
                     case PacketType.ParcelPropertiesUpdate:
                         ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
-                        OnParcelPropertiesUpdateRequest(updatePacket, this);
+                        if (OnParcelPropertiesUpdateRequest != null)
+                        {
+                            OnParcelPropertiesUpdateRequest(updatePacket, this);
+                        }
                         break;
                     #endregion
 
-- 
cgit v1.1