diff options
author | Jonathan Freedman | 2010-10-24 14:51:38 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-24 14:51:38 -0400 |
commit | 6b9660eb9685b9e89091547c662ce58d1145dd24 (patch) | |
tree | d210e8fbe05f0a30eb306103542a05f6ba5ddcf0 /OpenSim/Region | |
parent | * throw debug message when no HomeURI is set (diff) | |
parent | Change some exception to use ToString(). e.Message is not sufficient to fix (diff) | |
download | opensim-SC-6b9660eb9685b9e89091547c662ce58d1145dd24.zip opensim-SC-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.gz opensim-SC-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.bz2 opensim-SC-6b9660eb9685b9e89091547c662ce58d1145dd24.tar.xz |
Merge branch 'master' into mantis5110
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 48d5a12..74ad485 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -3423,7 +3423,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3423 | 3423 | ||
3424 | avp.Sender.IsTrial = false; | 3424 | avp.Sender.IsTrial = false; |
3425 | avp.Sender.ID = agentID; | 3425 | avp.Sender.ID = agentID; |
3426 | m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); | 3426 | //m_log.DebugFormat("[CLIENT]: Sending appearance for {0} to {1}", agentID.ToString(), AgentId.ToString()); |
3427 | OutPacket(avp, ThrottleOutPacketType.Task); | 3427 | OutPacket(avp, ThrottleOutPacketType.Task); |
3428 | } | 3428 | } |
3429 | 3429 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index a1451ce..d4a09b4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
188 | m_log.ErrorFormat( | 188 | m_log.ErrorFormat( |
189 | "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); | 189 | "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); |
190 | 190 | ||
191 | m_log.Error("[ARCHIVER]: OAR save aborted."); | 191 | m_log.Error("[ARCHIVER]: OAR save aborted. PLEASE DO NOT USE THIS OAR, IT WILL BE INCOMPLETE."); |
192 | } | 192 | } |
193 | catch (Exception e) | 193 | catch (Exception e) |
194 | { | 194 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ef18d02..4878b3e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2395,7 +2395,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2395 | } | 2395 | } |
2396 | catch (Exception e) | 2396 | catch (Exception e) |
2397 | { | 2397 | { |
2398 | m_log.WarnFormat("[SCENE]: Problem casting object: {0}", e.Message); | 2398 | m_log.WarnFormat("[SCENE]: Problem casting object: " + e.ToString()); |
2399 | return false; | 2399 | return false; |
2400 | } | 2400 | } |
2401 | 2401 | ||
@@ -3347,7 +3347,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3347 | } | 3347 | } |
3348 | catch (Exception e) | 3348 | catch (Exception e) |
3349 | { | 3349 | { |
3350 | m_log.DebugFormat("[CONNECTION BEGIN]: Exception verifying presence {0}", e.Message); | 3350 | m_log.ErrorFormat("[CONNECTION BEGIN]: Exception verifying presence " + e.ToString()); |
3351 | return false; | 3351 | return false; |
3352 | } | 3352 | } |
3353 | 3353 | ||
@@ -3358,7 +3358,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3358 | } | 3358 | } |
3359 | catch (Exception e) | 3359 | catch (Exception e) |
3360 | { | 3360 | { |
3361 | m_log.DebugFormat("[CONNECTION BEGIN]: Exception authorizing user {0}", e.Message); | 3361 | m_log.ErrorFormat("[CONNECTION BEGIN]: Exception authorizing user " + e.ToString()); |
3362 | return false; | 3362 | return false; |
3363 | } | 3363 | } |
3364 | 3364 | ||