From 62e0b53ca4697a852ee1e36e86da6a32e93bd55e Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Fri, 19 Mar 2010 05:58:34 -0700
Subject: 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.

---
 .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')

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
     
                 // Save avatar attachment information
                 ScenePresence presence;
-                if (m_scene.AvatarFactory != null && m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+                if (m_scene.AvatarFactory != null && m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
                 {
                     m_log.Info(
                         "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId 
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 AttachmentPt = att.RootPart.AttachmentPoint;
 
             ScenePresence presence;
-            if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
                 item = m_scene.InventoryService.GetItem(item);
@@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
             }
 
             ScenePresence presence;
-            if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 // XXYY!!
                 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
         public void ShowDetachInUserInventory(UUID itemID, IClientAPI remoteClient)
         {
             ScenePresence presence;
-            if (m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+            if (m_scene.TryGetScenePresence(remoteClient.AgentId, out presence))
             {
                 presence.Appearance.DetachAttachment(itemID);
 
-- 
cgit v1.1