aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-06-09 11:13:02 +0000
committerMW2007-06-09 11:13:02 +0000
commit3658015de8f614b99f116b2971957307f0960c55 (patch)
tree491156d6c9a5319bdf032c94abd70784c157854e /OpenSim/OpenSim.RegionServer
parentProtip: Check for obvious errors before submitting (diff)
downloadopensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.zip
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.gz
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.bz2
opensim-SC_OLD-3658015de8f614b99f116b2971957307f0960c55.tar.xz
Number of small changes.
Diffstat (limited to '')
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.API.cs40
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs18
2 files changed, 55 insertions, 3 deletions
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
98 /// <summary> 98 /// <summary>
99 /// 99 ///
100 /// </summary> 100 /// </summary>
101 /// <param name="regionInfo"></param>
102 public void SendRegionHandshake(RegionInfo regionInfo)
103 {
104 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
105 RegionHandshakePacket handshake = new RegionHandshakePacket();
106
107 handshake.RegionInfo.BillableFactor = regionInfo.estateSettings.billableFactor;
108 handshake.RegionInfo.IsEstateManager = false;
109 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.estateSettings.terrainHeightRange0;
110 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.estateSettings.terrainHeightRange1;
111 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.estateSettings.terrainHeightRange2;
112 handshake.RegionInfo.TerrainHeightRange11 = regionInfo.estateSettings.terrainHeightRange3;
113 handshake.RegionInfo.TerrainStartHeight00 = regionInfo.estateSettings.terrainStartHeight0;
114 handshake.RegionInfo.TerrainStartHeight01 = regionInfo.estateSettings.terrainStartHeight1;
115 handshake.RegionInfo.TerrainStartHeight10 = regionInfo.estateSettings.terrainStartHeight2;
116 handshake.RegionInfo.TerrainStartHeight11 = regionInfo.estateSettings.terrainStartHeight3;
117 handshake.RegionInfo.SimAccess = (byte)regionInfo.estateSettings.simAccess;
118 handshake.RegionInfo.WaterHeight = regionInfo.estateSettings.waterHeight;
119
120
121 handshake.RegionInfo.RegionFlags = (uint)regionInfo.estateSettings.regionFlags;
122
123 handshake.RegionInfo.SimName = _enc.GetBytes(regionInfo.estateSettings.waterHeight + "\0");
124 handshake.RegionInfo.SimOwner = regionInfo.MasterAvatarAssignedUUID;
125 handshake.RegionInfo.TerrainBase0 = regionInfo.estateSettings.terrainBase0;
126 handshake.RegionInfo.TerrainBase1 = regionInfo.estateSettings.terrainBase1;
127 handshake.RegionInfo.TerrainBase2 = regionInfo.estateSettings.terrainBase2;
128 handshake.RegionInfo.TerrainBase3 = regionInfo.estateSettings.terrainBase3;
129 handshake.RegionInfo.TerrainDetail0 = regionInfo.estateSettings.terrainDetail0;
130 handshake.RegionInfo.TerrainDetail1 = regionInfo.estateSettings.terrainDetail1;
131 handshake.RegionInfo.TerrainDetail2 =regionInfo.estateSettings.terrainDetail2;
132 handshake.RegionInfo.TerrainDetail3 = regionInfo.estateSettings.terrainDetail3;
133 handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
134
135 this.OutPacket(handshake);
136 }
137
138 /// <summary>
139 ///
140 /// </summary>
101 /// <param name="regInfo"></param> 141 /// <param name="regInfo"></param>
102 public void MoveAgentIntoRegion(RegionInfo regInfo) 142 public void MoveAgentIntoRegion(RegionInfo regInfo)
103 { 143 {
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
457 #region Parcel related packets 457 #region Parcel related packets
458 case PacketType.ParcelPropertiesRequest: 458 case PacketType.ParcelPropertiesRequest:
459 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack; 459 ParcelPropertiesRequestPacket propertiesRequest = (ParcelPropertiesRequestPacket)Pack;
460 if(OnParcelPropertiesRequest != null)
461 {
460 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); 462 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);
463 }
461 break; 464 break;
462 case PacketType.ParcelDivide: 465 case PacketType.ParcelDivide:
463 ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack; 466 ParcelDividePacket parcelDivide = (ParcelDividePacket)Pack;
464 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); 467 if (OnParcelDivideRequest != null)
468 {
469 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);
470 }
465 break; 471 break;
466 case PacketType.ParcelJoin: 472 case PacketType.ParcelJoin:
467 ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack; 473 ParcelJoinPacket parcelJoin = (ParcelJoinPacket)Pack;
468 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); 474 if (OnParcelJoinRequest != null)
475 {
476 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);
477 }
469 break; 478 break;
470 case PacketType.ParcelPropertiesUpdate: 479 case PacketType.ParcelPropertiesUpdate:
471 ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack; 480 ParcelPropertiesUpdatePacket updatePacket = (ParcelPropertiesUpdatePacket)Pack;
472 OnParcelPropertiesUpdateRequest(updatePacket, this); 481 if (OnParcelPropertiesUpdateRequest != null)
482 {
483 OnParcelPropertiesUpdateRequest(updatePacket, this);
484 }
473 break; 485 break;
474 #endregion 486 #endregion
475 487