aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-22 23:56:58 +0100
committerJustin Clark-Casey (justincc)2010-10-22 23:56:58 +0100
commit80f90229e514075ae8b0c8a38da58e1300780478 (patch)
tree86f05bdff474bc42ee90a7e1d3dcfc508ab2bc04 /OpenSim
parentRevert "Merge remote branch 'otakup0pe/mantis5110'" (diff)
parentChange some exception to use ToString(). e.Message is not sufficient to fix (diff)
downloadopensim-SC_OLD-80f90229e514075ae8b0c8a38da58e1300780478.zip
opensim-SC_OLD-80f90229e514075ae8b0c8a38da58e1300780478.tar.gz
opensim-SC_OLD-80f90229e514075ae8b0c8a38da58e1300780478.tar.bz2
opensim-SC_OLD-80f90229e514075ae8b0c8a38da58e1300780478.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c9ae558..3dd0f3a 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