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.
parent
bb513c1d88
commit
46116864b9
|
@ -135,6 +135,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
public void RegionLoaded(Scene scene)
|
public void RegionLoaded(Scene scene)
|
||||||
{
|
{
|
||||||
m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService;
|
m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService;
|
||||||
|
if (m_UserProfileService != null)
|
||||||
|
m_log.Debug("[XXXX] Set m_UserProfileService in " + m_Scene.RegionInfo.RegionName);
|
||||||
|
|
||||||
if (!m_Enabled)
|
if (!m_Enabled)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -318,10 +321,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
|
||||||
private UUID GetSessionID(UUID userID)
|
private UUID GetSessionID(UUID userID)
|
||||||
{
|
{
|
||||||
if (m_Scene == null)
|
if (m_Scene == null)
|
||||||
|
{
|
||||||
m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null");
|
m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null");
|
||||||
|
}
|
||||||
|
|
||||||
if (m_UserProfileService == null)
|
if (m_UserProfileService == null)
|
||||||
|
{
|
||||||
m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null");
|
m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null");
|
||||||
|
return UUID.Zero;
|
||||||
|
}
|
||||||
|
|
||||||
CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
|
CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
|
||||||
if (uinfo != null)
|
if (uinfo != null)
|
||||||
|
|
Loading…
Reference in New Issue