aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 02:02:12 +0200
committerMelanie2010-05-05 23:41:57 +0100
commit2b48ed60ecf45e4ec07af1cadbb6325c3e678a13 (patch)
tree5e0b65431fdc30a2bc9a01b7b6c864f2b91e6b48
parentStab a test fail (diff)
downloadopensim-SC_OLD-2b48ed60ecf45e4ec07af1cadbb6325c3e678a13.zip
opensim-SC_OLD-2b48ed60ecf45e4ec07af1cadbb6325c3e678a13.tar.gz
opensim-SC_OLD-2b48ed60ecf45e4ec07af1cadbb6325c3e678a13.tar.bz2
opensim-SC_OLD-2b48ed60ecf45e4ec07af1cadbb6325c3e678a13.tar.xz
Remove the m_Viewer variable and make the property a shortcut to the
proper field in AgentCircuitData instead
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
2 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index fff024f..1a46837 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2651,10 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes
2651 2651
2652 ScenePresence sp = CreateAndAddScenePresence(client); 2652 ScenePresence sp = CreateAndAddScenePresence(client);
2653 if (aCircuit != null) 2653 if (aCircuit != null)
2654 {
2655 sp.Appearance = aCircuit.Appearance; 2654 sp.Appearance = aCircuit.Appearance;
2656 sp.Viewer = aCircuit.Viewer;
2657 }
2658 2655
2659 // HERE!!! Do the initial attachments right here 2656 // HERE!!! Do the initial attachments right here
2660 // first agent upon login is a root agent by design. 2657 // 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 fb66fcd..30eafd7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -218,8 +218,6 @@ namespace OpenSim.Region.Framework.Scenes
218 private bool m_followCamAuto; 218 private bool m_followCamAuto;
219 219
220 private int m_movementUpdateCount; 220 private int m_movementUpdateCount;
221 private string m_Viewer = String.Empty;
222
223 private const int NumMovementsBetweenRayCast = 5; 221 private const int NumMovementsBetweenRayCast = 5;
224 222
225 private bool CameraConstraintActive; 223 private bool CameraConstraintActive;
@@ -654,8 +652,7 @@ namespace OpenSim.Region.Framework.Scenes
654 652
655 public string Viewer 653 public string Viewer
656 { 654 {
657 get { return m_Viewer; } 655 get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
658 set { m_Viewer = value; }
659 } 656 }
660 657
661 #endregion 658 #endregion