aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorLatif Khalifa2013-11-17 13:43:05 +0100
committerJustin Clark-Casey (justincc)2013-11-19 23:29:10 +0000
commit9ba5a7e190497be05a4e1f54ba3140366750277a (patch)
tree19414cd239835938c19a450f79292ee8b784a188 /OpenSim
parentAdd regression test to check that specifying a non-existent event raise a syn... (diff)
downloadopensim-SC_OLD-9ba5a7e190497be05a4e1f54ba3140366750277a.zip
opensim-SC_OLD-9ba5a7e190497be05a4e1f54ba3140366750277a.tar.gz
opensim-SC_OLD-9ba5a7e190497be05a4e1f54ba3140366750277a.tar.bz2
opensim-SC_OLD-9ba5a7e190497be05a4e1f54ba3140366750277a.tar.xz
Normalize viewer version string to accomodate new style version reporting in the viewers
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs25
1 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index ffcc584..acf925a 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,7 +128,30 @@ 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 ViewerInternal;
132
133 /// <summary>
134 /// Viewer's version string
135 /// </summary>
136 public string Viewer
137 {
138 set { ViewerInternal = value; }
139 // Try to return consistent viewer string taking into account
140 // that viewers have chaagned how version is reported
141 // See http://opensimulator.org/mantis/view.php?id=6851
142 get
143 {
144 // Old style version string contains viewer name followed by a space followed by a version number
145 if (ViewerInternal.Contains(" "))
146 {
147 return ViewerInternal;
148 }
149 else // New style version contains no spaces, just version number
150 {
151 return Channel + " " + ViewerInternal;
152 }
153 }
154 }
132 155
133 /// <summary> 156 /// <summary>
134 /// The channel strinf sent by the viewer at login 157 /// The channel strinf sent by the viewer at login