From 93ac47f0d3968650bd7758ad0981e8e5d49b8138 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 29 Mar 2012 01:08:47 +0100
Subject: Revert "Simplify friends caching by only doing this for root agents -
 no functions require caching for child agents." We need to cache child agents
 so that friends object edit/delete permissions will work across boarders on
 regions hosted by different simulators.

This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
---
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs             | 4 ++--
 OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/OptionalModules')

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 43548e6..5cf478a 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         private UUID m_agentID = UUID.Random();
 
-        public ISceneAgent SceneAgent { get; set; }
+        public ISceneAgent SceneAgent { get; private set; }
 
         private string m_username;
         private string m_nick;
@@ -895,7 +895,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
 
         public void Start()
         {
-            m_scene.AddNewClient(this, PresenceType.User);
+            SceneAgent = m_scene.AddNewClient(this, PresenceType.User);
 
             // Mimicking LLClientView which gets always set appearance from client.
             AvatarAppearance appearance;
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 5ea5af7..16ec34f 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             get { return m_ownerID; }
         }
 
-        public ISceneAgent SceneAgent { get; set; }
+        public ISceneAgent SceneAgent { get { throw new NotImplementedException(); } }
 
         public void Say(string message)
         {
-- 
cgit v1.1