From 80fc607d7536d4f375da4d01280a00fe656654c4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 8 Jun 2011 16:01:33 -0700
Subject: Fixed "Unknown User" listed as creator/owner on prims created with
the Build button by foreign visitors. Added command to the
UserManagementModule to list all the known bindings between user UUIDs and
their names: show user-names.
---
.../UserManagement/UserManagementModule.cs | 74 +++++++++++++++++++---
.../Region/Framework/Interfaces/IUserManagement.cs | 1 +
OpenSim/Region/Framework/Scenes/Scene.cs | 4 ++
3 files changed, 71 insertions(+), 8 deletions(-)
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 9051194..ae4336c 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -30,6 +30,7 @@ using System.IO;
using System.Reflection;
using OpenSim.Framework;
+using OpenSim.Framework.Console;
using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces;
@@ -80,6 +81,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
// }
// }
//}
+ MainConsole.Instance.Commands.AddCommand("grid", true,
+ "show user-names",
+ "show user-names",
+ "Show the bindings between user UUIDs and user names",
+ String.Empty,
+ HandleShowUsers);
+
+
}
public bool IsSharedModule
@@ -103,6 +112,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
scene.RegisterModuleInterface<IUserManagement>(this);
scene.EventManager.OnNewClient += new EventManager.OnNewClientDelegate(EventManager_OnNewClient);
+ scene.EventManager.OnPrimsLoaded += new EventManager.PrimsLoaded(EventManager_OnPrimsLoaded);
}
public void RemoveRegion(Scene scene)
@@ -111,18 +121,12 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
m_Scenes.Remove(scene);
}
- public void RegionLoaded(Scene scene)
+ public void RegionLoaded(Scene s)
{
}
public void PostInitialise()
{
- foreach (Scene s in m_Scenes)
- {
- // let's sniff all the user names referenced by objects in the scene
- m_log.DebugFormat("[USER MANAGEMENT MODULE]: Caching creators' data from {0} ({1} objects)...", s.RegionInfo.RegionName, s.GetEntities().Length);
- s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); });
- }
}
public void Close()
@@ -136,6 +140,14 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
#region Event Handlers
+ void EventManager_OnPrimsLoaded(Scene s)
+ {
+ // let's sniff all the user names referenced by objects in the scene
+ m_log.DebugFormat("[USER MANAGEMENT MODULE]: Caching creators' data from {0} ({1} objects)...", s.RegionInfo.RegionName, s.GetEntities().Length);
+ s.ForEachSOG(delegate(SceneObjectGroup sog) { CacheCreators(sog); });
+ }
+
+
void EventManager_OnNewClient(IClientAPI client)
{
client.OnNameFromUUIDRequest += new UUIDNameRequest(HandleUUIDNameRequest);
@@ -143,7 +155,6 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
void HandleUUIDNameRequest(UUID uuid, IClientAPI remote_client)
{
- //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0}", uuid);
if (m_Scenes[0].LibraryService != null && (m_Scenes[0].LibraryService.LibraryRootFolder.Owner == uuid))
{
remote_client.SendNameReply(uuid, "Mr", "OpenSim");
@@ -153,6 +164,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
string[] names = GetUserNames(uuid);
if (names.Length == 2)
{
+ //m_log.DebugFormat("[XXX] HandleUUIDNameRequest {0} is {1} {2}", uuid, names[0], names[1]);
remote_client.SendNameReply(uuid, names[0], names[1]);
}
@@ -254,6 +266,32 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
return string.Empty;
}
+ public string GetUserUUI(UUID userID)
+ {
+ UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID);
+ if (account != null)
+ return userID.ToString();
+
+ if (m_UserCache.ContainsKey(userID))
+ {
+ UserData ud = m_UserCache[userID];
+ string homeURL = ud.HomeURL;
+ string first = ud.FirstName, last = ud.LastName;
+ if (ud.LastName.StartsWith("@"))
+ {
+ string[] parts = ud.FirstName.Split('.');
+ if (parts.Length >= 2)
+ {
+ first = parts[0];
+ last = parts[1];
+ }
+ return userID + ";" + homeURL + ";" + first + " " + last;
+ }
+ }
+
+ return userID.ToString();
+ }
+
public void AddUser(UUID id, string creatorData)
{
if (m_UserCache.ContainsKey(id))
@@ -343,5 +381,25 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
//}
#endregion IUserManagement
+
+ private void HandleShowUsers(string module, string[] cmd)
+ {
+ if (m_UserCache.Count == 0)
+ {
+ MainConsole.Instance.Output("No users not found");
+ return;
+ }
+
+ MainConsole.Instance.Output("UUID User Name");
+ MainConsole.Instance.Output("-----------------------------------------------------------------------------");
+ foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache)
+ {
+ MainConsole.Instance.Output(String.Format("{0} {1} {2}",
+ kvp.Key, kvp.Value.FirstName, kvp.Value.LastName));
+ }
+ return;
+ }
+
+
}
}
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
index 9cac3b0..5d30aa8 100644
--- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
+++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs
@@ -9,6 +9,7 @@ namespace OpenSim.Region.Framework.Interfaces
{
string GetUserName(UUID uuid);
string GetUserHomeURL(UUID uuid);
+ string GetUserUUI(UUID uuid);
string GetUserServerURL(UUID uuid, string serverType);
void AddUser(UUID uuid, string userData);
void AddUser(UUID uuid, string firstName, string lastName, string profileURL);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f122b58..bdf3d1d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1910,6 +1910,10 @@ namespace OpenSim.Region.Framework.Scenes
sceneObject.SetGroup(groupID, null);
}
+ IUserManagement uman = RequestModuleInterface<IUserManagement>();
+ if (uman != null)
+ sceneObject.RootPart.CreatorIdentification = uman.GetUserUUI(ownerID);
+
sceneObject.ScheduleGroupForFullUpdate();
return sceneObject;
--
cgit v1.1