OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor: Clean up and make consistent some log file messages in EstateManagementModule relating to RAW file uploading.

bullet-2.82
Justin Clark-Casey (justincc) 2014-05-14 19:22:55 +01:00
parent c23d37a509
commit 0c0ee95bd8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -1106,13 +1106,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
TerrainUploader = null; TerrainUploader = null;
} }
m_log.DebugFormat("[CLIENT]: Terrain upload from {0} to {1} complete.", remoteClient.Name, Scene.Name);
remoteClient.SendAlertMessage("Terrain Upload Complete. Loading...."); remoteClient.SendAlertMessage("Terrain Upload Complete. Loading....");
ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>(); ITerrainModule terr = Scene.RequestModuleInterface<ITerrainModule>();
if (terr != null) if (terr != null)
{ {
m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
try try
{ {
MemoryStream terrainStream = new MemoryStream(terrainData); MemoryStream terrainStream = new MemoryStream(terrainData);
@ -1161,7 +1162,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
{ {
if (TerrainUploader == null) if (TerrainUploader == null)
{ {
m_log.DebugFormat("Starting to receive uploaded terrain"); m_log.DebugFormat(
"[TERRAIN]: Started receiving terrain upload for region {0} from {1}",
Scene.Name, remote_client.Name);
TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName); TerrainUploader = new EstateTerrainXferHandler(remote_client, clientFileName);
remote_client.OnXferReceive += TerrainUploader.XferReceive; remote_client.OnXferReceive += TerrainUploader.XferReceive;
remote_client.OnAbortXfer += AbortTerrainXferHandler; remote_client.OnAbortXfer += AbortTerrainXferHandler;
@ -1182,7 +1186,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
if (terr != null) if (terr != null)
{ {
m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName); // m_log.Warn("[CLIENT]: Got Request to Send Terrain in region " + Scene.RegionInfo.RegionName);
if (File.Exists(Util.dataDir() + "/terrain.raw")) if (File.Exists(Util.dataDir() + "/terrain.raw"))
{ {
File.Delete(Util.dataDir() + "/terrain.raw"); File.Delete(Util.dataDir() + "/terrain.raw");
@ -1194,8 +1198,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
input.Read(bdata, 0, (int)input.Length); input.Read(bdata, 0, (int)input.Length);
remote_client.SendAlertMessage("Terrain file written, starting download..."); remote_client.SendAlertMessage("Terrain file written, starting download...");
Scene.XferManager.AddNewFile("terrain.raw", bdata); Scene.XferManager.AddNewFile("terrain.raw", bdata);
// Tell client about it
m_log.Warn("[CLIENT]: Sending Terrain to " + remote_client.Name); m_log.DebugFormat("[CLIENT]: Sending terrain for region {0} to {1}", Scene.Name, remote_client.Name);
remote_client.SendInitiateDownload("terrain.raw", clientFileName); remote_client.SendInitiateDownload("terrain.raw", clientFileName);
} }
} }