* 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
parent
2e758172f0
commit
203017f554
|
@ -346,12 +346,11 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Update the version string with extra information if it's available.
|
/// Enhance 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.
|
|
||||||
/// </summary>
|
/// </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 svnFileName = "../.svn/entries";
|
||||||
string inputLine;
|
string inputLine;
|
||||||
int strcmp;
|
int strcmp;
|
||||||
|
@ -381,6 +380,24 @@ namespace OpenSim
|
||||||
{
|
{
|
||||||
VersionInfo.Version += ", SVN build r" + 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>
|
/// <summary>
|
||||||
|
@ -388,7 +405,8 @@ namespace OpenSim
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void InternalStartUp()
|
protected void InternalStartUp()
|
||||||
{
|
{
|
||||||
updateAvailableVersionInformation();
|
enhanceVersionInformation();
|
||||||
|
|
||||||
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
|
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
|
||||||
|
|
||||||
m_stats = StatsManager.StartCollectingSimExtraStats();
|
m_stats = StatsManager.StartCollectingSimExtraStats();
|
||||||
|
|
|
@ -350,11 +350,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
{
|
{
|
||||||
m_moneyBalance = 1000;
|
m_moneyBalance = 1000;
|
||||||
|
|
||||||
m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
|
m_channelVersion = Helpers.StringToField("OpenSimulator Server " + scene.GetSimulatorVersion());
|
||||||
|
|
||||||
InitDefaultAnimations();
|
InitDefaultAnimations();
|
||||||
|
|
||||||
|
|
||||||
m_scene = scene;
|
m_scene = scene;
|
||||||
m_assetCache = assetCache;
|
m_assetCache = assetCache;
|
||||||
|
|
||||||
|
|
|
@ -293,22 +293,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
m_statsReporter.SetObjectCapacity(objectCapacity);
|
m_statsReporter.SetObjectCapacity(objectCapacity);
|
||||||
|
|
||||||
string OSString = "";
|
m_simulatorVersion = simulatorVersion
|
||||||
|
|
||||||
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
|
|
||||||
+ " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
|
+ " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
|
||||||
+ " PhysPrim:" + m_physicalPrim.ToString();
|
+ " PhysPrim:" + m_physicalPrim.ToString();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue