aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-08-14 09:57:18 -0700
committerDiva Canto2009-08-14 09:57:18 -0700
commit70d7c97e94a0bab80080009e9906977e9475d35f (patch)
tree02e33d44e98cbae135f3ff3ccdaac9d8ccdb3f28
parentAdditional debug messages, and bug fix in RemoteInventoryServiceConnector.cs,... (diff)
downloadopensim-SC_OLD-70d7c97e94a0bab80080009e9906977e9475d35f.zip
opensim-SC_OLD-70d7c97e94a0bab80080009e9906977e9475d35f.tar.gz
opensim-SC_OLD-70d7c97e94a0bab80080009e9906977e9475d35f.tar.bz2
opensim-SC_OLD-70d7c97e94a0bab80080009e9906977e9475d35f.tar.xz
Doing session lookup in the right way.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs9
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs10
2 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index f0493f7..cb9a462 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -393,7 +393,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
393 { 393 {
394 if (item == null) 394 if (item == null)
395 return null; 395 return null;
396 396 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetItem {0} for user {1}", item.ID, item.Owner);
397 if (IsLocalGridUser(item.Owner)) 397 if (IsLocalGridUser(item.Owner))
398 return m_GridService.GetItem(item); 398 return m_GridService.GetItem(item);
399 else 399 else
@@ -445,10 +445,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
445 445
446 private UUID GetSessionID(UUID userID) 446 private UUID GetSessionID(UUID userID)
447 { 447 {
448 ScenePresence sp = m_Scene.GetScenePresence(userID); 448 CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
449 if (sp != null) 449 if (uinfo != null)
450 return sp.ControllingClient.SessionId; 450 return uinfo.SessionID;
451 451
452 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user profile for {0} not found", userID);
452 return UUID.Zero; 453 return UUID.Zero;
453 } 454 }
454 455
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 8722e68..5992145 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -32,6 +32,7 @@ using System.Reflection;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
35using OpenSim.Framework.Communications.Cache;
35using OpenSim.Services.Connectors; 36using OpenSim.Services.Connectors;
36using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
@@ -313,11 +314,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
313 314
314 private UUID GetSessionID(UUID userID) 315 private UUID GetSessionID(UUID userID)
315 { 316 {
316 ScenePresence sp = m_Scene.GetScenePresence(userID); 317 CachedUserInfo uinfo = m_Scene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
317 if (sp != null) 318 if (uinfo != null)
318 return sp.ControllingClient.SessionId; 319 return uinfo.SessionID;
319 320 m_log.DebugFormat("[INVENTORY CONNECTOR]: user profile for {0} not found", userID);
320 return UUID.Zero; 321 return UUID.Zero;
322
321 } 323 }
322 324
323 } 325 }