diff options
author | Dan Lake | 2010-03-19 05:58:34 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-19 15:16:44 -0700 |
commit | 62e0b53ca4697a852ee1e36e86da6a32e93bd55e (patch) | |
tree | aacaa4c84a0b7e61784909ca76fb1528ca06938b /OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory | |
parent | Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetA... (diff) | |
download | opensim-SC_OLD-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.zip opensim-SC_OLD-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.gz opensim-SC_OLD-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.bz2 opensim-SC_OLD-62e0b53ca4697a852ee1e36e86da6a32e93bd55e.tar.xz |
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index c6312e0..54508cc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -502,7 +502,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
502 | private UUID GetSessionID(UUID userID) | 502 | private UUID GetSessionID(UUID userID) |
503 | { | 503 | { |
504 | ScenePresence sp = null; | 504 | ScenePresence sp = null; |
505 | if (m_Scene.TryGetAvatar(userID, out sp)) | 505 | if (m_Scene.TryGetScenePresence(userID, out sp)) |
506 | { | 506 | { |
507 | return sp.ControllingClient.SessionId; | 507 | return sp.ControllingClient.SessionId; |
508 | } | 508 | } |
@@ -521,7 +521,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
521 | if (account == null) // foreign user | 521 | if (account == null) // foreign user |
522 | { | 522 | { |
523 | ScenePresence sp = null; | 523 | ScenePresence sp = null; |
524 | m_Scene.TryGetAvatar(userID, out sp); | 524 | m_Scene.TryGetScenePresence(userID, out sp); |
525 | if (sp != null) | 525 | if (sp != null) |
526 | { | 526 | { |
527 | AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); | 527 | AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs index 3c3534f..5e06580 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs | |||
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
100 | ScenePresence sp = null; | 100 | ScenePresence sp = null; |
101 | foreach (Scene s in m_Scenes) | 101 | foreach (Scene s in m_Scenes) |
102 | { | 102 | { |
103 | s.TryGetAvatar(clientID, out sp); | 103 | s.TryGetScenePresence(clientID, out sp); |
104 | if ((sp != null) && !sp.IsChildAgent && (s != scene)) | 104 | if ((sp != null) && !sp.IsChildAgent && (s != scene)) |
105 | { | 105 | { |
106 | m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache", | 106 | m_log.DebugFormat("[INVENTORY CACHE]: OnClientClosed in {0}, but user {1} still in sim. Keeping system folders in cache", |