aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-05-06 00:34:49 +0200
committerMelanie2010-05-05 22:15:32 +0100
commit2ebe1482664533bb9b9040134fe4a23fbc939d51 (patch)
tree41c7c99c6da6ecd1ff217730e1dd95dd680ec5da /OpenSim/Region
parentAdd a XMLRPC method to remotely set the login level for the LLLoginService. (diff)
downloadopensim-SC-2ebe1482664533bb9b9040134fe4a23fbc939d51.zip
opensim-SC-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.gz
opensim-SC-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.bz2
opensim-SC-2ebe1482664533bb9b9040134fe4a23fbc939d51.tar.xz
Plumb the viewer version string through into AgentCircuitData. Now all that
is left os to figure out what black magic turns AgentCircuitData into AgentData and then copy that into the ScenePresence, where m_Viewer is already added with this commit and waits for the data.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3efb45f..b4bbbe3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -218,6 +218,7 @@ 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;
221 222
222 private const int NumMovementsBetweenRayCast = 5; 223 private const int NumMovementsBetweenRayCast = 5;
223 224
@@ -651,6 +652,11 @@ namespace OpenSim.Region.Framework.Scenes
651 set { m_flyDisabled = value; } 652 set { m_flyDisabled = value; }
652 } 653 }
653 654
655 public string Viewer
656 {
657 get { return m_Viewer; }
658 }
659
654 #endregion 660 #endregion
655 661
656 #region Constructor(s) 662 #region Constructor(s)