aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authormingchen2007-06-08 19:51:12 +0000
committermingchen2007-06-08 19:51:12 +0000
commit9d1eacad7a03c437dad647e0ff134f2318dbdc45 (patch)
treed525bb49ec1db53b468edca20fca522ce04b0355 /OpenSim
parent*RegionInfo in Avatar class now protected again (oops, my fault) (diff)
downloadopensim-SC_OLD-9d1eacad7a03c437dad647e0ff134f2318dbdc45.zip
opensim-SC_OLD-9d1eacad7a03c437dad647e0ff134f2318dbdc45.tar.gz
opensim-SC_OLD-9d1eacad7a03c437dad647e0ff134f2318dbdc45.tar.bz2
opensim-SC_OLD-9d1eacad7a03c437dad647e0ff134f2318dbdc45.tar.xz
*Moved SendRegionHandshake back to IClientAPI and modded sendRegionHandshakeToAll to support the old method. (Again, my bad)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.World/Avatar.cs33
-rw-r--r--OpenSim/OpenSim.World/Estate/EstateManager.cs37
2 files changed, 33 insertions, 37 deletions
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index 4c3bc34..d597ca7 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -168,7 +168,38 @@ namespace OpenSim.world
168 /// </summary> 168 /// </summary>
169 public void SendRegionHandshake() 169 public void SendRegionHandshake()
170 { 170 {
171 this.m_world.estateManager.sendRegionHandshake(this.ControllingClient); 171 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
172 RegionHandshakePacket handshake = new RegionHandshakePacket();
173
174 handshake.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
175 handshake.RegionInfo.IsEstateManager = false;
176 handshake.RegionInfo.TerrainHeightRange00 = m_regInfo.estateSettings.terrainHeightRange0;
177 handshake.RegionInfo.TerrainHeightRange01 = m_regInfo.estateSettings.terrainHeightRange1;
178 handshake.RegionInfo.TerrainHeightRange10 = m_regInfo.estateSettings.terrainHeightRange2;
179 handshake.RegionInfo.TerrainHeightRange11 = m_regInfo.estateSettings.terrainHeightRange3;
180 handshake.RegionInfo.TerrainStartHeight00 = m_regInfo.estateSettings.terrainStartHeight0;
181 handshake.RegionInfo.TerrainStartHeight01 = m_regInfo.estateSettings.terrainStartHeight1;
182 handshake.RegionInfo.TerrainStartHeight10 = m_regInfo.estateSettings.terrainStartHeight2;
183 handshake.RegionInfo.TerrainStartHeight11 = m_regInfo.estateSettings.terrainStartHeight3;
184 handshake.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
185 handshake.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
186
187
188 handshake.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
189
190 handshake.RegionInfo.SimName = _enc.GetBytes(m_regInfo.estateSettings.waterHeight + "\0");
191 handshake.RegionInfo.SimOwner = m_regInfo.MasterAvatarAssignedUUID;
192 handshake.RegionInfo.TerrainBase0 = m_regInfo.estateSettings.terrainBase0;
193 handshake.RegionInfo.TerrainBase1 = m_regInfo.estateSettings.terrainBase1;
194 handshake.RegionInfo.TerrainBase2 = m_regInfo.estateSettings.terrainBase2;
195 handshake.RegionInfo.TerrainBase3 = m_regInfo.estateSettings.terrainBase3;
196 handshake.RegionInfo.TerrainDetail0 = m_regInfo.estateSettings.terrainDetail0;
197 handshake.RegionInfo.TerrainDetail1 = m_regInfo.estateSettings.terrainDetail1;
198 handshake.RegionInfo.TerrainDetail2 = m_regInfo.estateSettings.terrainDetail2;
199 handshake.RegionInfo.TerrainDetail3 = m_regInfo.estateSettings.terrainDetail3;
200 handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
201
202 this.ControllingClient.OutPacket(handshake);
172 } 203 }
173 204
174 /// <summary> 205 /// <summary>
diff --git a/OpenSim/OpenSim.World/Estate/EstateManager.cs b/OpenSim/OpenSim.World/Estate/EstateManager.cs
index cbcc702..85d9b0c 100644
--- a/OpenSim/OpenSim.World/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.World/Estate/EstateManager.cs
@@ -227,7 +227,7 @@ namespace OpenSim.world.Estate
227 { 227 {
228 foreach (OpenSim.world.Avatar av in m_world.Avatars.Values) 228 foreach (OpenSim.world.Avatar av in m_world.Avatars.Values)
229 { 229 {
230 this.sendRegionHandshake(av.ControllingClient); 230 av.SendRegionHandshake();
231 } 231 }
232 } 232 }
233 233
@@ -259,40 +259,5 @@ namespace OpenSim.world.Estate
259 remote_client.OutPacket(regionInfoPacket); 259 remote_client.OutPacket(regionInfoPacket);
260 } 260 }
261 261
262 public void sendRegionHandshake(IClientAPI remote_client)
263 {
264 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
265 RegionHandshakePacket handshake = new RegionHandshakePacket();
266
267 handshake.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
268 handshake.RegionInfo.IsEstateManager = false;
269 handshake.RegionInfo.TerrainHeightRange00 = m_regInfo.estateSettings.terrainHeightRange0;
270 handshake.RegionInfo.TerrainHeightRange01 = m_regInfo.estateSettings.terrainHeightRange1;
271 handshake.RegionInfo.TerrainHeightRange10 = m_regInfo.estateSettings.terrainHeightRange2;
272 handshake.RegionInfo.TerrainHeightRange11 = m_regInfo.estateSettings.terrainHeightRange3;
273 handshake.RegionInfo.TerrainStartHeight00 = m_regInfo.estateSettings.terrainStartHeight0;
274 handshake.RegionInfo.TerrainStartHeight01 = m_regInfo.estateSettings.terrainStartHeight1;
275 handshake.RegionInfo.TerrainStartHeight10 = m_regInfo.estateSettings.terrainStartHeight2;
276 handshake.RegionInfo.TerrainStartHeight11 = m_regInfo.estateSettings.terrainStartHeight3;
277 handshake.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
278 handshake.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
279
280
281 handshake.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
282
283 handshake.RegionInfo.SimName = _enc.GetBytes(m_regInfo.estateSettings.waterHeight + "\0");
284 handshake.RegionInfo.SimOwner = m_regInfo.MasterAvatarAssignedUUID;
285 handshake.RegionInfo.TerrainBase0 = m_regInfo.estateSettings.terrainBase0;
286 handshake.RegionInfo.TerrainBase1 = m_regInfo.estateSettings.terrainBase1;
287 handshake.RegionInfo.TerrainBase2 = m_regInfo.estateSettings.terrainBase2;
288 handshake.RegionInfo.TerrainBase3 = m_regInfo.estateSettings.terrainBase3;
289 handshake.RegionInfo.TerrainDetail0 = m_regInfo.estateSettings.terrainDetail0;
290 handshake.RegionInfo.TerrainDetail1 = m_regInfo.estateSettings.terrainDetail1;
291 handshake.RegionInfo.TerrainDetail2 = m_regInfo.estateSettings.terrainDetail2;
292 handshake.RegionInfo.TerrainDetail3 = m_regInfo.estateSettings.terrainDetail3;
293 handshake.RegionInfo.CacheID = LLUUID.Random(); //I guess this is for the client to remember an old setting?
294
295 remote_client.OutPacket(handshake);
296 }
297 } 262 }
298} 263}