diff options
author | Diva Canto | 2011-12-29 16:12:06 -0800 |
---|---|---|
committer | Diva Canto | 2011-12-29 16:12:06 -0800 |
commit | 571efeddb20f38bb4164074b3c217be5387ca2e0 (patch) | |
tree | 0385b1e7d3ad2b602d7079105469a3e7ee8a0166 /OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | |
parent | Added field LocalToGrid in UserAccount. Context: make HG work in Simian. (diff) | |
download | opensim-SC_OLD-571efeddb20f38bb4164074b3c217be5387ca2e0.zip opensim-SC_OLD-571efeddb20f38bb4164074b3c217be5387ca2e0.tar.gz opensim-SC_OLD-571efeddb20f38bb4164074b3c217be5387ca2e0.tar.bz2 opensim-SC_OLD-571efeddb20f38bb4164074b3c217be5387ca2e0.tar.xz |
Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs index 560d913..bf1d787 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | |||
@@ -180,10 +180,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
180 | 180 | ||
181 | // m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); | 181 | // m_log.DebugFormat("[HG INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); |
182 | // Is the user a local user? | 182 | // Is the user a local user? |
183 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, toAgentID); | ||
184 | string url = string.Empty; | 183 | string url = string.Empty; |
185 | bool foreigner = false; | 184 | bool foreigner = false; |
186 | if (account == null) // foreign user | 185 | if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(toAgentID)) // foreign user |
187 | { | 186 | { |
188 | url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI"); | 187 | url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI"); |
189 | foreigner = true; | 188 | foreigner = true; |