From f9984a9685ac92a34272f7231a0ec4097fc31a79 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 19 Nov 2013 23:39:52 +0000 Subject: [PATCH] rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code --- OpenSim/Framework/AgentCircuitData.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 51f0a1e4b8..f2fe49452a 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs @@ -128,27 +128,28 @@ namespace OpenSim.Framework /// /// Viewer's version string as reported by the viewer at login /// - private string ViewerInternal; + private string m_viewerInternal; /// /// Viewer's version string /// public string Viewer { - set { ViewerInternal = value; } + set { m_viewerInternal = value; } + // Try to return consistent viewer string taking into account // that viewers have chaagned how version is reported // See http://opensimulator.org/mantis/view.php?id=6851 get { // Old style version string contains viewer name followed by a space followed by a version number - if (ViewerInternal == null || ViewerInternal.Contains(" ")) + if (m_viewerInternal == null || m_viewerInternal.Contains(" ")) { - return ViewerInternal; + return m_viewerInternal; } else // New style version contains no spaces, just version number { - return Channel + " " + ViewerInternal; + return Channel + " " + m_viewerInternal; } } }