diff options
author | Diva Canto | 2010-01-30 15:43:10 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-30 15:43:10 -0800 |
commit | a0d79e621cc8ee4935dfc2816da75db9c23c1b84 (patch) | |
tree | b4850a6ee90f4cd98f68109dad29b7b9c8c9f242 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | * HGScene is no more. (diff) | |
download | opensim-SC_OLD-a0d79e621cc8ee4935dfc2816da75db9c23c1b84.zip opensim-SC_OLD-a0d79e621cc8ee4935dfc2816da75db9c23c1b84.tar.gz opensim-SC_OLD-a0d79e621cc8ee4935dfc2816da75db9c23c1b84.tar.bz2 opensim-SC_OLD-a0d79e621cc8ee4935dfc2816da75db9c23c1b84.tar.xz |
Bug fix: change HGBroker to a INonSharedRegionModule
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index ecd7002..09798aa 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -183,7 +183,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
183 | public bool IsForeignUser(UUID userID, out string assetServerURL) | 183 | public bool IsForeignUser(UUID userID, out string assetServerURL) |
184 | { | 184 | { |
185 | assetServerURL = string.Empty; | 185 | assetServerURL = string.Empty; |
186 | UserAccount account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID); | 186 | UserAccount account = null; |
187 | if (m_Scene.UserAccountService != null) | ||
188 | account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID); | ||
189 | |||
187 | if (account == null) // foreign | 190 | if (account == null) // foreign |
188 | { | 191 | { |
189 | ScenePresence sp = null; | 192 | ScenePresence sp = null; |
@@ -193,7 +196,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
193 | if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI")) | 196 | if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI")) |
194 | { | 197 | { |
195 | assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString(); | 198 | assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString(); |
196 | return true; | 199 | assetServerURL = assetServerURL.Trim(new char[] { '/' }); return true; |
197 | } | 200 | } |
198 | } | 201 | } |
199 | } | 202 | } |