rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code
parent
b71952df49
commit
f9984a9685
|
@ -128,27 +128,28 @@ namespace OpenSim.Framework
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Viewer's version string as reported by the viewer at login
|
/// Viewer's version string as reported by the viewer at login
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private string ViewerInternal;
|
private string m_viewerInternal;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Viewer's version string
|
/// Viewer's version string
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Viewer
|
public string Viewer
|
||||||
{
|
{
|
||||||
set { ViewerInternal = value; }
|
set { m_viewerInternal = value; }
|
||||||
|
|
||||||
// Try to return consistent viewer string taking into account
|
// Try to return consistent viewer string taking into account
|
||||||
// that viewers have chaagned how version is reported
|
// that viewers have chaagned how version is reported
|
||||||
// See http://opensimulator.org/mantis/view.php?id=6851
|
// See http://opensimulator.org/mantis/view.php?id=6851
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
// Old style version string contains viewer name followed by a space followed by a version number
|
// 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
|
else // New style version contains no spaces, just version number
|
||||||
{
|
{
|
||||||
return Channel + " " + ViewerInternal;
|
return Channel + " " + m_viewerInternal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue