aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index b3f0a25..4d74b2a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -489,7 +489,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
489 im.imSessionID = im.fromAgentID; 489 im.imSessionID = im.fromAgentID;
490 490
491 // Try the local sim 491 // Try the local sim
492 UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID); 492 UserAccount account = UserAccountService.GetUserAccount(UUID.Zero, agentID);
493 im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; 493 im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
494 494
495 if (LocalFriendshipOffered(friendID, im)) 495 if (LocalFriendshipOffered(friendID, im))
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 496f2ab..1b53a42 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
116 if (!UUID.TryParse(request["ToID"].ToString(), out toID)) 116 if (!UUID.TryParse(request["ToID"].ToString(), out toID))
117 return FailureResult(); 117 return FailureResult();
118 118
119 UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(m_FriendsModule.Scene.RegionInfo.ScopeID, fromID); 119 UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID);
120 string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; 120 string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
121 121
122 GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 122 GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID,
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index bf84100..4cc6905 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
183 return returnstring; 183 return returnstring;
184 } 184 }
185 185
186 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, uuid); 186 UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(UUID.Zero, uuid);
187 187
188 if (account != null) 188 if (account != null)
189 { 189 {