diff options
author | Melanie | 2012-09-27 15:46:35 +0100 |
---|---|---|
committer | Melanie | 2012-09-27 15:46:35 +0100 |
commit | 637f5440feaa1b00e3b06644afe85f83b5a9394e (patch) | |
tree | 9355f991b903d97c7089e78a5be82510f846de8b /OpenSim/Region/CoreModules/Framework | |
parent | Merge commit 'ddd9384b3901f532243c1e8018334385b84290d1' into careminster (diff) | |
parent | Use GridUser properly for foreign users. (diff) | |
download | opensim-SC_OLD-637f5440feaa1b00e3b06644afe85f83b5a9394e.zip opensim-SC_OLD-637f5440feaa1b00e3b06644afe85f83b5a9394e.tar.gz opensim-SC_OLD-637f5440feaa1b00e3b06644afe85f83b5a9394e.tar.bz2 opensim-SC_OLD-637f5440feaa1b00e3b06644afe85f83b5a9394e.tar.xz |
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
3 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs index a1d8d5a..a5c4584 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs | |||
@@ -106,7 +106,6 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
106 | return m_ExportedAppearances; | 106 | return m_ExportedAppearances; |
107 | } | 107 | } |
108 | } | 108 | } |
109 | |||
110 | 109 | ||
111 | #region ISharedRegionModule | 110 | #region ISharedRegionModule |
112 | 111 | ||
@@ -149,9 +148,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
149 | base.AddRegion(scene); | 148 | base.AddRegion(scene); |
150 | 149 | ||
151 | if (m_Enabled) | 150 | if (m_Enabled) |
151 | { | ||
152 | scene.RegisterModuleInterface<IUserAgentVerificationModule>(this); | 152 | scene.RegisterModuleInterface<IUserAgentVerificationModule>(this); |
153 | 153 | scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject; | |
154 | scene.EventManager.OnIncomingSceneObject += OnIncomingSceneObject; | 154 | } |
155 | } | 155 | } |
156 | 156 | ||
157 | void OnIncomingSceneObject(SceneObjectGroup so) | 157 | void OnIncomingSceneObject(SceneObjectGroup so) |
@@ -245,6 +245,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
245 | { | 245 | { |
246 | // Log them out of this grid | 246 | // Log them out of this grid |
247 | Scene.PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | 247 | Scene.PresenceService.LogoutAgent(sp.ControllingClient.SessionId); |
248 | string userId = Scene.UserManagementModule.GetUserUUI(sp.UUID); | ||
249 | Scene.GridUserService.LoggedOut(userId, UUID.Zero, Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat); | ||
248 | } | 250 | } |
249 | } | 251 | } |
250 | 252 | ||
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs index 4eecaa2..acefc97 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/HGUserManagementModule.cs | |||
@@ -137,6 +137,9 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
137 | ud.FirstName = words[0]; | 137 | ud.FirstName = words[0]; |
138 | ud.LastName = "@" + words[1]; | 138 | ud.LastName = "@" + words[1]; |
139 | users.Add(ud); | 139 | users.Add(ud); |
140 | // WARNING! that uriStr is not quite right... it may be missing the / at the end, | ||
141 | // which will cause trouble (duplicate entries on some tables). We should | ||
142 | // get the UUI instead from the UAS. TO BE FIXED. | ||
140 | AddUser(userID, names[0], names[1], uriStr); | 143 | AddUser(userID, names[0], names[1], uriStr); |
141 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: User {0}@{1} found", words[0], words[1]); | 144 | m_log.DebugFormat("[USER MANAGEMENT MODULE]: User {0}@{1} found", words[0], words[1]); |
142 | } | 145 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index f4ed67b..36c84c7 100644 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | |||
@@ -429,8 +429,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
429 | 429 | ||
430 | public void AddUser(UUID uuid, string first, string last, string homeURL) | 430 | public void AddUser(UUID uuid, string first, string last, string homeURL) |
431 | { | 431 | { |
432 | // m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL); | 432 | //m_log.DebugFormat("[USER MANAGEMENT MODULE]: Adding user with id {0}, first {1}, last {2}, url {3}", uuid, first, last, homeURL); |
433 | |||
434 | AddUser(uuid, homeURL + ";" + first + " " + last); | 433 | AddUser(uuid, homeURL + ";" + first + " " + last); |
435 | } | 434 | } |
436 | 435 | ||
@@ -553,8 +552,8 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement | |||
553 | MainConsole.Instance.Output("-----------------------------------------------------------------------------"); | 552 | MainConsole.Instance.Output("-----------------------------------------------------------------------------"); |
554 | foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache) | 553 | foreach (KeyValuePair<UUID, UserData> kvp in m_UserCache) |
555 | { | 554 | { |
556 | MainConsole.Instance.Output(String.Format("{0} {1} {2}", | 555 | MainConsole.Instance.Output(String.Format("{0} {1} {2} ({3})", |
557 | kvp.Key, kvp.Value.FirstName, kvp.Value.LastName)); | 556 | kvp.Key, kvp.Value.FirstName, kvp.Value.LastName, kvp.Value.HomeURL)); |
558 | } | 557 | } |
559 | 558 | ||
560 | return; | 559 | return; |