OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Refactor: Move enhancement of version string with operating system information from Scene to OpenSimMain 

* This also means the operating system info will show up in the region console (and hence the logs)
0.6.0-stable
Justin Clarke Casey 2008-05-22 00:32:04 +00:00
parent 2e758172f0
commit 203017f554
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -346,12 +346,11 @@ namespace OpenSim
}
/// <summary>
/// Update the version string with extra information if it's available.
/// This currently means adding a subversion number if the root .svn/entries file is present.
/// Enhance the version string with extra information if it's available.
/// </summary>
protected void updateAvailableVersionInformation()
protected void enhanceVersionInformation()
{
// Set BuildVersion String for Show version command
// Add subversion revision information if available
string svnFileName = "../.svn/entries";
string inputLine;
int strcmp;
@ -380,7 +379,25 @@ namespace OpenSim
if (!string.IsNullOrEmpty(buildVersion))
{
VersionInfo.Version += ", SVN build r" + buildVersion;
}
// Add operating system information if available
string OSString = "";
if (System.Environment.OSVersion.Platform != PlatformID.Unix)
{
OSString = System.Environment.OSVersion.ToString();
}
else
{
OSString = Util.ReadEtcIssue();
}
if (OSString.Length > 45)
{
OSString = OSString.Substring(0, 45);
}
VersionInfo.Version += " on " + OSString;
}
/// <summary>
@ -388,7 +405,8 @@ namespace OpenSim
/// </summary>
protected void InternalStartUp()
{
updateAvailableVersionInformation();
enhanceVersionInformation();
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
m_stats = StatsManager.StartCollectingSimExtraStats();

3
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -350,11 +350,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{
m_moneyBalance = 1000;
m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
m_channelVersion = Helpers.StringToField("OpenSimulator Server " + scene.GetSimulatorVersion());
InitDefaultAnimations();
m_scene = scene;
m_assetCache = assetCache;

17
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -293,22 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
m_statsReporter.SetObjectCapacity(objectCapacity);
string OSString = "";
if (System.Environment.OSVersion.Platform != PlatformID.Unix)
{
OSString = System.Environment.OSVersion.ToString();
}
else
{
OSString = Util.ReadEtcIssue();
}
if (OSString.Length > 45)
{
OSString = OSString.Substring(0, 45);
}
m_simulatorVersion = simulatorVersion + " on " + OSString
m_simulatorVersion = simulatorVersion
+ " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
+ " PhysPrim:" + m_physicalPrim.ToString();
}