aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-11-27 00:21:41 +0000
committerJustin Clark-Casey (justincc)2014-11-27 00:24:17 +0000
commit8a27fc5d610938f72cfe0daa4d2988ff08db8623 (patch)
treefa8f1f0bbd09f2b3876dc1fbfb674aebe074d174
parentMerge branch 'master' of /team/src/opensim (diff)
downloadopensim-SC_OLD-8a27fc5d610938f72cfe0daa4d2988ff08db8623.zip
opensim-SC_OLD-8a27fc5d610938f72cfe0daa4d2988ff08db8623.tar.gz
opensim-SC_OLD-8a27fc5d610938f72cfe0daa4d2988ff08db8623.tar.bz2
opensim-SC_OLD-8a27fc5d610938f72cfe0daa4d2988ff08db8623.tar.xz
Make UMM.AddUser(UUID, string) log message when bad creatorData is given to reflect its location (UMM not Scene) and add the user name and ID.
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs12
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 6a997b3..58ec8ba 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -598,6 +598,10 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
598 //creatorData = <endpoint>;<name> 598 //creatorData = <endpoint>;<name>
599 599
600 string[] parts = creatorData.Split(';'); 600 string[] parts = creatorData.Split(';');
601
602 if (parts.Length >= 2)
603 user.FirstName = parts[1].Replace(' ', '.');
604
601 if (parts.Length >= 1) 605 if (parts.Length >= 1)
602 { 606 {
603 user.HomeURL = parts[0]; 607 user.HomeURL = parts[0];
@@ -608,13 +612,13 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
608 } 612 }
609 catch (UriFormatException) 613 catch (UriFormatException)
610 { 614 {
611 m_log.DebugFormat("[SCENE]: Unable to parse Uri {0}", parts[0]); 615 m_log.DebugFormat(
616 "[USER MANAGEMENT MODULE]: Unable to parse home URL {0} for user name {1}, ID {2} when adding user info.",
617 parts[0], user.FirstName ?? "Unknown", id);
618
612 user.LastName = "@unknown"; 619 user.LastName = "@unknown";
613 } 620 }
614 } 621 }
615
616 if (parts.Length >= 2)
617 user.FirstName = parts[1].Replace(' ', '.');
618 } 622 }
619 else 623 else
620 { 624 {