From 02dea4ce580a08a9a4119ed063ed36704bb44825 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Thu, 6 May 2010 02:02:12 +0200
Subject: Remove the m_Viewer variable and make the property a shortcut to the
 proper field in AgentCircuitData instead

---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 3 ---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 897fda6..0ca5948 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2679,10 +2679,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 ScenePresence sp = CreateAndAddScenePresence(client);
                 if (aCircuit != null)
-                {
                     sp.Appearance = aCircuit.Appearance;
-                    sp.Viewer = aCircuit.Viewer;
-                }
 
                 // HERE!!! Do the initial attachments right here
                 // first agent upon login is a root agent by design.
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f649dfe..cb24784 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -227,8 +227,6 @@ namespace OpenSim.Region.Framework.Scenes
         private int m_lastColCount = -1;		//KF: Look for Collision chnages
         private int m_updateCount = 0;			//KF: Update Anims for a while
         private static readonly int UPDATE_COUNT = 10;		// how many frames to update for
-        private string m_Viewer = String.Empty;
-
         private const int NumMovementsBetweenRayCast = 5;
 
         private bool CameraConstraintActive;
@@ -667,8 +665,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public string Viewer
         {
-            get { return m_Viewer; }
-            set { m_Viewer = value; }
+            get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
         }
 
         #endregion
-- 
cgit v1.1