aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-06-14 10:11:30 +0000
committerMW2007-06-14 10:11:30 +0000
commitc8db62e0e4b226537a2d727817c4a60c81d8a5cc (patch)
tree534f984fef9a41a6801011bf0b98690894bb6631
parent* Updated Prebuild.exe (diff)
downloadopensim-SC_OLD-c8db62e0e4b226537a2d727817c4a60c81d8a5cc.zip
opensim-SC_OLD-c8db62e0e4b226537a2d727817c4a60c81d8a5cc.tar.gz
opensim-SC_OLD-c8db62e0e4b226537a2d727817c4a60c81d8a5cc.tar.bz2
opensim-SC_OLD-c8db62e0e4b226537a2d727817c4a60c81d8a5cc.tar.xz
Fixed the bug that makes a region use its water height as its name (in regionhandshake), which lead to most regions being called "20".
-rw-r--r--OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
index 7a34334..0bf0615 100644
--- a/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
+++ b/OpenSim/OpenSim.RegionServer/Estate/EstateManager.cs
@@ -275,7 +275,7 @@ namespace OpenSim.RegionServer.Estate
275 275
276 handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags; 276 handshake.RegionInfo.RegionFlags = (uint)m_world.m_regInfo.estateSettings.regionFlags;
277 277
278 handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.estateSettings.waterHeight + "\0"); 278 handshake.RegionInfo.SimName = _enc.GetBytes(m_world.m_regInfo.RegionName + "\0");
279 handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID; 279 handshake.RegionInfo.SimOwner = m_world.m_regInfo.MasterAvatarAssignedUUID;
280 handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0; 280 handshake.RegionInfo.TerrainBase0 = m_world.m_regInfo.estateSettings.terrainBase0;
281 handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1; 281 handshake.RegionInfo.TerrainBase1 = m_world.m_regInfo.estateSettings.terrainBase1;