aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-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 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
2679 2679
2680 ScenePresence sp = CreateAndAddScenePresence(client); 2680 ScenePresence sp = CreateAndAddScenePresence(client);
2681 if (aCircuit != null) 2681 if (aCircuit != null)
2682 {
2683 sp.Appearance = aCircuit.Appearance; 2682 sp.Appearance = aCircuit.Appearance;
2684 sp.Viewer = aCircuit.Viewer;
2685 }
2686 2683
2687 // HERE!!! Do the initial attachments right here 2684 // HERE!!! Do the initial attachments right here
2688 // first agent upon login is a root agent by design. 2685 // 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
227 private int m_lastColCount = -1; //KF: Look for Collision chnages 227 private int m_lastColCount = -1; //KF: Look for Collision chnages
228 private int m_updateCount = 0; //KF: Update Anims for a while 228 private int m_updateCount = 0; //KF: Update Anims for a while
229 private static readonly int UPDATE_COUNT = 10; // how many frames to update for 229 private static readonly int UPDATE_COUNT = 10; // how many frames to update for
230 private string m_Viewer = String.Empty;
231
232 private const int NumMovementsBetweenRayCast = 5; 230 private const int NumMovementsBetweenRayCast = 5;
233 231
234 private bool CameraConstraintActive; 232 private bool CameraConstraintActive;
@@ -667,8 +665,7 @@ namespace OpenSim.Region.Framework.Scenes
667 665
668 public string Viewer 666 public string Viewer
669 { 667 {
670 get { return m_Viewer; } 668 get { return m_scene.AuthenticateHandler.GetAgentCircuitData(ControllingClient.CircuitCode).Viewer; }
671 set { m_Viewer = value; }
672 } 669 }
673 670
674 #endregion 671 #endregion