ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into varregion

Browse Source
This commit is contained in:
Robert Adams
2013-11-24 07:23:12 -08:00
parent 604b39cea9 60e049ea39
commit 3193bcaae1
19 changed files with 9257 additions and 8624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Framework/AgentCircuitData.cs
View File

@@ -128,7 +128,31 @@ namespace OpenSim.Framework
/// <summary>
/// Viewer's version string as reported by the viewer at login
/// </summary>
public string Viewer;
private string m_viewerInternal;
/// <summary>
/// Viewer's version string
/// </summary>
public string Viewer
{
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 (m_viewerInternal == null || m_viewerInternal.Contains(" "))
{
return m_viewerInternal;
}
else // New style version contains no spaces, just version number
{
return Channel + " " + m_viewerInternal;
}
}
}
/// <summary>
/// The channel strinf sent by the viewer at login