diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index a032bc7..eecc478 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -1106,13 +1106,14 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1106 | 1106 | ||
1107 | TerrainUploader = null; | 1107 | TerrainUploader = null; |
1108 | } | 1108 | } |
1109 | |||
1110 | m_log.DebugFormat("[CLIENT]: Terrain upload from {0} to {1} complete.", remoteClient.Name, Scene.Name); | ||
1109 | remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); | 1111 | remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); |
1112 | |||
1110 | ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>(); | 1113 | ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>(); |
1111 | 1114 | ||
1112 | if (terr != null) | 1115 | if (terr != null) |
1113 | { | 1116 | { |
1114 | m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName); | ||
1115 | |||
1116 | try | 1117 | try |
1117 | { | 1118 | { |
1118 | MemoryStream terrainStream = new MemoryStream(terrainData); | 1119 | MemoryStream terrainStream = new MemoryStream(terrainData); |
@@ -1161,7 +1162,10 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1161 | { | 1162 | { |
1162 | if (TerrainUploader == null) | 1163 | if (TerrainUploader == null) |
1163 | { | 1164 | { |
1164 | m_log.DebugFormat("Starting to receive uploaded terrain"); | 1165 | m_log.DebugFormat( |
1166 | "[TERRAIN]: Started receiving terrain upload for region {0} from {1}", | ||
1167 | Scene.Name, remote_client.Name); | ||
1168 | |||
1165 | TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName); | 1169 | TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName); |
1166 | remote_client.OnXferReceive += TerrainUploader.XferReceive; | 1170 | remote_client.OnXferReceive += TerrainUploader.XferReceive; |
1167 | remote_client.OnAbortXfer += AbortTerrainXferHandler; | 1171 | remote_client.OnAbortXfer += AbortTerrainXferHandler; |
@@ -1182,7 +1186,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1182 | 1186 | ||
1183 | if (terr != null) | 1187 | if (terr != null) |
1184 | { | 1188 | { |
1185 | m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName); | 1189 | // m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName); |
1186 | if (File.Exists(Util.dataDir() + "/terrain.raw")) | 1190 | if (File.Exists(Util.dataDir() + "/terrain.raw")) |
1187 | { | 1191 | { |
1188 | File.Delete(Util.dataDir() + "/terrain.raw"); | 1192 | File.Delete(Util.dataDir() + "/terrain.raw"); |
@@ -1194,8 +1198,9 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1194 | input.Read(bdata, 0, (int)input.Length); | 1198 | input.Read(bdata, 0, (int)input.Length); |
1195 | remote_client.SendAlertMessage("Terrain file written, starting download..."); | 1199 | remote_client.SendAlertMessage("Terrain file written, starting download..."); |
1196 | Scene.XferManager.AddNewFile("terrain.raw", bdata); | 1200 | Scene.XferManager.AddNewFile("terrain.raw", bdata); |
1197 | // Tell client about it | 1201 | |
1198 | m_log.Warn("[CLIENT]: Sending Terrain to " + remote_client.Name); | 1202 | m_log.DebugFormat("[CLIENT]: Sending terrain for region {0} to {1}", Scene.Name, remote_client.Name); |
1203 | |||
1199 | remote_client.SendInitiateDownload("terrain.raw", clientFileName); | 1204 | remote_client.SendInitiateDownload("terrain.raw", clientFileName); |
1200 | } | 1205 | } |
1201 | } | 1206 | } |