aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorRobert Adams2013-11-24 07:23:12 -0800
committerRobert Adams2013-11-24 07:23:12 -0800
commit3193bcaae1cbe86d22c4ade5c79d5e25d11a59da (patch)
treec96b96a7302f5323df63f6255e528de68ab67c6f /OpenSim/Framework
parentMerge branch 'master' into varregion (diff)
parentRevert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
downloadopensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.zip
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.gz
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.bz2
opensim-SC_OLD-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.xz
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs26
1 files changed, 25 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index ffcc584..f2fe494 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,7 +128,31 @@ namespace OpenSim.Framework
128 /// <summary> 128 /// <summary>
129 /// Viewer's version string as reported by the viewer at login 129 /// Viewer's version string as reported by the viewer at login
130 /// </summary> 130 /// </summary>
131 public string Viewer; 131 private string m_viewerInternal;
132
133 /// <summary>
134 /// Viewer's version string
135 /// </summary>
136 public string Viewer
137 {
138 set { m_viewerInternal = value; }
139
140 // Try to return consistent viewer string taking into account
141 // that viewers have chaagned how version is reported
142 // See http://opensimulator.org/mantis/view.php?id=6851
143 get
144 {
145 // Old style version string contains viewer name followed by a space followed by a version number
146 if (m_viewerInternal == null || m_viewerInternal.Contains(" "))
147 {
148 return m_viewerInternal;
149 }
150 else // New style version contains no spaces, just version number
151 {
152 return Channel + " " + m_viewerInternal;
153 }
154 }
155 }
132 156
133 /// <summary> 157 /// <summary>
134 /// The channel strinf sent by the viewer at login 158 /// The channel strinf sent by the viewer at login