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/Avatar/Attachments | |
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 '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index f54e41a..23828ef 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
86 | 86 | ||
87 | // Save avatar attachment information | 87 | // Save avatar attachment information |
88 | ScenePresence presence; | 88 | ScenePresence presence; |
89 | if (m_scene.AvatarFactory != null && m_scene.TryGetAvatar(remoteClient.AgentId, out presence)) | 89 | if (m_scene.AvatarFactory != null && m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
90 | { | 90 | { |
91 | m_log.Info( | 91 | m_log.Info( |
92 | "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId | 92 | "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId |
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
255 | AttachmentPt = att.RootPart.AttachmentPoint; | 255 | AttachmentPt = att.RootPart.AttachmentPoint; |
256 | 256 | ||
257 | ScenePresence presence; | 257 | ScenePresence presence; |
258 | if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence)) | 258 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
259 | { | 259 | { |
260 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 260 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
261 | item = m_scene.InventoryService.GetItem(item); | 261 | item = m_scene.InventoryService.GetItem(item); |
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
299 | } | 299 | } |
300 | 300 | ||
301 | ScenePresence presence; | 301 | ScenePresence presence; |
302 | if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence)) | 302 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
303 | { | 303 | { |
304 | // XXYY!! | 304 | // XXYY!! |
305 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 305 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
314 | public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient) | 314 | public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient) |
315 | { | 315 | { |
316 | ScenePresence presence; | 316 | ScenePresence presence; |
317 | if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence)) | 317 | if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence)) |
318 | { | 318 | { |
319 | presence.Appearance.DetachAttachment(itemID); | 319 | presence.Appearance.DetachAttachment(itemID); |
320 | 320 | ||