aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-19 23:39:52 +0000
committerJustin Clark-Casey (justincc)2013-11-19 23:39:52 +0000
commitf9984a9685ac92a34272f7231a0ec4097fc31a79 (patch)
treeabce9a447693c33d69dabd16187c162a735740ed /OpenSim
parentStop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has be... (diff)
downloadopensim-SC_OLD-f9984a9685ac92a34272f7231a0ec4097fc31a79.zip
opensim-SC_OLD-f9984a9685ac92a34272f7231a0ec4097fc31a79.tar.gz
opensim-SC_OLD-f9984a9685ac92a34272f7231a0ec4097fc31a79.tar.bz2
opensim-SC_OLD-f9984a9685ac92a34272f7231a0ec4097fc31a79.tar.xz
rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs11
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 51f0a1e..f2fe494 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -128,27 +128,28 @@ 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 private string ViewerInternal; 131 private string m_viewerInternal;
132 132
133 /// <summary> 133 /// <summary>
134 /// Viewer's version string 134 /// Viewer's version string
135 /// </summary> 135 /// </summary>
136 public string Viewer 136 public string Viewer
137 { 137 {
138 set { ViewerInternal = value; } 138 set { m_viewerInternal = value; }
139
139 // Try to return consistent viewer string taking into account 140 // Try to return consistent viewer string taking into account
140 // that viewers have chaagned how version is reported 141 // that viewers have chaagned how version is reported
141 // See http://opensimulator.org/mantis/view.php?id=6851 142 // See http://opensimulator.org/mantis/view.php?id=6851
142 get 143 get
143 { 144 {
144 // Old style version string contains viewer name followed by a space followed by a version number 145 // Old style version string contains viewer name followed by a space followed by a version number
145 if (ViewerInternal == null || ViewerInternal.Contains(" ")) 146 if (m_viewerInternal == null || m_viewerInternal.Contains(" "))
146 { 147 {
147 return ViewerInternal; 148 return m_viewerInternal;
148 } 149 }
149 else // New style version contains no spaces, just version number 150 else // New style version contains no spaces, just version number
150 { 151 {
151 return Channel + " " + ViewerInternal; 152 return Channel + " " + m_viewerInternal;
152 } 153 }
153 } 154 }
154 } 155 }