diff options
author | Melanie Thielker | 2010-05-06 00:34:49 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-05-06 00:34:49 +0200 |
commit | 733a07e061cdcb6095677758a264ba976bb94b93 (patch) | |
tree | ed3e9ac5c860884a17427dcfb9ea5a2cccc0a72f /OpenSim/Region/Framework/Scenes | |
parent | Add a XMLRPC method to remotely set the login level for the LLLoginService. (diff) | |
download | opensim-SC_OLD-733a07e061cdcb6095677758a264ba976bb94b93.zip opensim-SC_OLD-733a07e061cdcb6095677758a264ba976bb94b93.tar.gz opensim-SC_OLD-733a07e061cdcb6095677758a264ba976bb94b93.tar.bz2 opensim-SC_OLD-733a07e061cdcb6095677758a264ba976bb94b93.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 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 562232c..987180b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -227,6 +227,7 @@ 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; | ||
230 | 231 | ||
231 | private const int NumMovementsBetweenRayCast = 5; | 232 | private const int NumMovementsBetweenRayCast = 5; |
232 | 233 | ||
@@ -664,6 +665,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
664 | set { m_flyDisabled = value; } | 665 | set { m_flyDisabled = value; } |
665 | } | 666 | } |
666 | 667 | ||
668 | public string Viewer | ||
669 | { | ||
670 | get { return m_Viewer; } | ||
671 | } | ||
672 | |||
667 | #endregion | 673 | #endregion |
668 | 674 | ||
669 | #region Constructor(s) | 675 | #region Constructor(s) |