aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2013-07-06 16:51:14 -0700
committerDiva Canto2013-07-06 16:51:14 -0700
commit9b75d757241e87408c50b1f92996bf667960c348 (patch)
tree90c1020e9d4c4947d0f8fd08937f54d9f53c2d19 /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-9b75d757241e87408c50b1f92996bf667960c348.zip
opensim-SC_OLD-9b75d757241e87408c50b1f92996bf667960c348.tar.gz
opensim-SC_OLD-9b75d757241e87408c50b1f92996bf667960c348.tar.bz2
opensim-SC_OLD-9b75d757241e87408c50b1f92996bf667960c348.tar.xz
WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index a7cbc8f..11227ef 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -521,6 +521,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
521 lock (m_UserCache) 521 lock (m_UserCache)
522 m_UserCache.Remove(id); 522 m_UserCache.Remove(id);
523 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL); 523 m_log.DebugFormat("[USER MANAGEMENT MODULE]: Re-adding user with id {0}, creatorData [{1}] and old HomeURL {2}", id, creatorData, oldUser.HomeURL);
524 Util.PrintCallStack();
525
524 } 526 }
525 else 527 else
526 { 528 {
@@ -555,7 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
555 } 557 }
556 catch (UriFormatException) 558 catch (UriFormatException)
557 { 559 {
558 m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]); 560 m_log.DebugFormat("[SCENE]: Unable to parse Uri {0} from {1}", parts[0], creatorData);
559 user.LastName = "@unknown"; 561 user.LastName = "@unknown";
560 } 562 }
561 } 563 }