diff options
author | Justin Clark-Casey (justincc) | 2010-10-30 01:32:56 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-30 01:32:56 +0100 |
commit | ade71c9ed7ce45b4acb1456df457fe94ad46bd23 (patch) | |
tree | 64392fc2ff23be656e3665dd4ff3023e4157a5da /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |
parent | tweak a few more scene presence logging messages for consistency (diff) | |
download | opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.zip opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.gz opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.bz2 opensim-SC_OLD-ade71c9ed7ce45b4acb1456df457fe94ad46bd23.tar.xz |
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 38fff1c..485e05a 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -193,10 +193,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
193 | GridRegion finalDestination = GetFinalDestination(reg); | 193 | GridRegion finalDestination = GetFinalDestination(reg); |
194 | if (finalDestination == null) | 194 | if (finalDestination == null) |
195 | { | 195 | { |
196 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent."); | 196 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent."); |
197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); | 197 | sp.ControllingClient.SendTeleportFailed("Problem at destination"); |
198 | return; | 198 | return; |
199 | } | 199 | } |
200 | |||
200 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", | 201 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}", |
201 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); | 202 | finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID); |
202 | 203 | ||
@@ -240,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
240 | } | 241 | } |
241 | catch (Exception e) | 242 | catch (Exception e) |
242 | { | 243 | { |
243 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace); | 244 | m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace); |
244 | sp.ControllingClient.SendTeleportFailed("Internal error"); | 245 | sp.ControllingClient.SendTeleportFailed("Internal error"); |
245 | } | 246 | } |
246 | } | 247 | } |
@@ -421,7 +422,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
421 | m_log.DebugFormat( | 422 | m_log.DebugFormat( |
422 | "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); | 423 | "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID); |
423 | 424 | ||
424 | |||
425 | if (eq != null) | 425 | if (eq != null) |
426 | { | 426 | { |
427 | eq.TeleportFinishEvent(destinationHandle, 13, endPoint, | 427 | eq.TeleportFinishEvent(destinationHandle, 13, endPoint, |
@@ -581,6 +581,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
581 | client.SendTeleportFailed("Your home region could not be found."); | 581 | client.SendTeleportFailed("Your home region could not be found."); |
582 | return; | 582 | return; |
583 | } | 583 | } |
584 | |||
584 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", | 585 | m_log.DebugFormat("[ENTITY TRANSFER MODULE]: User's home region is {0} {1} ({2}-{3})", |
585 | regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize); | 586 | regionInfo.RegionName, regionInfo.RegionID, regionInfo.RegionLocX / Constants.RegionSize, regionInfo.RegionLocY / Constants.RegionSize); |
586 | 587 | ||
@@ -1188,7 +1189,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1188 | Utils.LongToUInts(reg.RegionHandle, out x, out y); | 1189 | Utils.LongToUInts(reg.RegionHandle, out x, out y); |
1189 | x = x / Constants.RegionSize; | 1190 | x = x / Constants.RegionSize; |
1190 | y = y / Constants.RegionSize; | 1191 | y = y / Constants.RegionSize; |
1191 | m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); | 1192 | m_log.Debug("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")"); |
1192 | 1193 | ||
1193 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 1194 | string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort |
1194 | + "/CAPS/" + a.CapsPath + "0000/"; | 1195 | + "/CAPS/" + a.CapsPath + "0000/"; |
@@ -1224,7 +1225,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1224 | // TODO: make Event Queue disablable! | 1225 | // TODO: make Event Queue disablable! |
1225 | } | 1226 | } |
1226 | 1227 | ||
1227 | m_log.Info("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString()); | 1228 | m_log.Debug("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString()); |
1228 | 1229 | ||
1229 | } | 1230 | } |
1230 | 1231 | ||