diff options
author | Diva Canto | 2009-08-14 11:50:42 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-14 11:50:42 -0700 |
commit | 46116864b9f8cc63ec97b89f11bb5372f08dbc01 (patch) | |
tree | 80963144e3b9d64288dcd473e4d9ef461b888105 /OpenSim/Region/CoreModules | |
parent | Changed the way to get to the profile service. Changed GetSystemsFolder in HG... (diff) | |
download | opensim-SC_OLD-46116864b9f8cc63ec97b89f11bb5372f08dbc01.zip opensim-SC_OLD-46116864b9f8cc63ec97b89f11bb5372f08dbc01.tar.gz opensim-SC_OLD-46116864b9f8cc63ec97b89f11bb5372f08dbc01.tar.bz2 opensim-SC_OLD-46116864b9f8cc63ec97b89f11bb5372f08dbc01.tar.xz |
Returning UUID.Zero is scene and user profile service are null in GetSession. This doesn't fix the underlying problem of these things being null -- they shouldn't be.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 62df3bd..bef716b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | |||
@@ -135,6 +135,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
135 | public void RegionLoaded(Scene scene) | 135 | public void RegionLoaded(Scene scene) |
136 | { | 136 | { |
137 | m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService; | 137 | m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService; |
138 | if (m_UserProfileService != null) | ||
139 | m_log.Debug("[XXXX] Set m_UserProfileService in " + m_Scene.RegionInfo.RegionName); | ||
140 | |||
138 | if (!m_Enabled) | 141 | if (!m_Enabled) |
139 | return; | 142 | return; |
140 | 143 | ||
@@ -318,10 +321,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
318 | private UUID GetSessionID(UUID userID) | 321 | private UUID GetSessionID(UUID userID) |
319 | { | 322 | { |
320 | if (m_Scene == null) | 323 | if (m_Scene == null) |
324 | { | ||
321 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); | 325 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null"); |
326 | } | ||
322 | 327 | ||
323 | if (m_UserProfileService == null) | 328 | if (m_UserProfileService == null) |
329 | { | ||
324 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); | 330 | m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null"); |
331 | return UUID.Zero; | ||
332 | } | ||
325 | 333 | ||
326 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); | 334 | CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); |
327 | if (uinfo != null) | 335 | if (uinfo != null) |