aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 02:02:12 +0200
committerMelanie Thielker2010-05-06 02:02:12 +0200
commit02dea4ce580a08a9a4119ed063ed36704bb44825 (patch)
tree0e50041e4763dd343efd1ab1c9c0a33887cceec9 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-02dea4ce580a08a9a4119ed063ed36704bb44825.zip
opensim-SC-02dea4ce580a08a9a4119ed063ed36704bb44825.tar.gz
opensim-SC-02dea4ce580a08a9a4119ed063ed36704bb44825.tar.bz2
opensim-SC-02dea4ce580a08a9a4119ed063ed36704bb44825.tar.xz
Remove the m_Viewer variable and make the property a shortcut to the
proper field in AgentCircuitData instead
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 1 insertions, 4 deletions
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