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/ServiceConnectorsOut/Inventory | |
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/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 0d121ed..b5c0af6 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -218,9 +218,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
218 | /// <param name="userID"></param> | 218 | /// <param name="userID"></param> |
219 | private void CacheInventoryServiceURL(UUID userID) | 219 | private void CacheInventoryServiceURL(UUID userID) |
220 | { | 220 | { |
221 | if (m_Scenes[0].UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, userID) == null) | 221 | if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(userID)) |
222 | { | 222 | { |
223 | // The user does not have a local account; let's cache its service URL | 223 | // The user is not local; let's cache its service URL |
224 | string inventoryURL = string.Empty; | 224 | string inventoryURL = string.Empty; |
225 | ScenePresence sp = null; | 225 | ScenePresence sp = null; |
226 | foreach (Scene scene in m_Scenes) | 226 | foreach (Scene scene in m_Scenes) |