* Send VersionInfo string instead of the hardcoded Scene string to the "About Second Life" box
* This is the same string as printed out on the opensim region console at startup, so it should now include the svn revision number (if available) * This dialog box takes an awful long time to come up on my local system - no idea why that is. However, that also seems to have been the case before this revision.0.6.0-stable
parent
cca1563a78
commit
9263f07d70
|
@ -346,10 +346,10 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Print the version information available to the library. This include a subversion number if the root
|
/// Update the version string with extra information if it's available.
|
||||||
/// .svn/entries file is present.
|
/// This currently means adding a subversion number if the root .svn/entries file is present.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void printAvailableVersionInformation()
|
protected void updateAvailableVersionInformation()
|
||||||
{
|
{
|
||||||
// Set BuildVersion String for Show version command
|
// Set BuildVersion String for Show version command
|
||||||
string svnFileName = "../.svn/entries";
|
string svnFileName = "../.svn/entries";
|
||||||
|
@ -379,11 +379,7 @@ namespace OpenSim
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(buildVersion))
|
if (!string.IsNullOrEmpty(buildVersion))
|
||||||
{
|
{
|
||||||
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n");
|
VersionInfo.Version += ", SVN build r" + buildVersion;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -392,7 +388,8 @@ namespace OpenSim
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected void InternalStartUp()
|
protected void InternalStartUp()
|
||||||
{
|
{
|
||||||
printAvailableVersionInformation();
|
updateAvailableVersionInformation();
|
||||||
|
m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + "\n");
|
||||||
|
|
||||||
m_stats = StatsManager.StartCollectingSimExtraStats();
|
m_stats = StatsManager.StartCollectingSimExtraStats();
|
||||||
|
|
||||||
|
|
|
@ -28,9 +28,10 @@
|
||||||
namespace OpenSim
|
namespace OpenSim
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// Exists purely to hold version information.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class VersionInfo
|
public class VersionInfo
|
||||||
{
|
{
|
||||||
public static string Version = "trunk (0.5.6 and additional code)";
|
public static string Version = "trunk (post 0.5.6)";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@ using Axiom.Math;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using libsecondlife.Packets;
|
using libsecondlife.Packets;
|
||||||
using OpenJPEGNet;
|
using OpenJPEGNet;
|
||||||
|
using OpenSim;
|
||||||
using OpenSim.Framework;
|
using OpenSim.Framework;
|
||||||
using OpenSim.Framework.Communications;
|
using OpenSim.Framework.Communications;
|
||||||
using OpenSim.Framework.Communications.Cache;
|
using OpenSim.Framework.Communications.Cache;
|
||||||
|
@ -86,7 +87,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
private int m_incrementsof15seconds = 0;
|
private int m_incrementsof15seconds = 0;
|
||||||
private volatile bool m_backingup = false;
|
private volatile bool m_backingup = false;
|
||||||
|
|
||||||
public string m_simulatorVersion = "OpenSimulator 0.5";
|
protected string m_simulatorVersion = VersionInfo.Version;
|
||||||
|
|
||||||
protected ModuleLoader m_moduleLoader;
|
protected ModuleLoader m_moduleLoader;
|
||||||
protected StorageManager m_storageManager;
|
protected StorageManager m_storageManager;
|
||||||
|
@ -307,7 +308,9 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
OSString = OSString.Substring(0, 45);
|
OSString = OSString.Substring(0, 45);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString();
|
// m_simulatorVersion += " on " + OSString
|
||||||
|
// + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
|
||||||
|
// + " PhysPrim:" + m_physicalPrim.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
@ -763,6 +763,7 @@
|
||||||
<Reference name="System.Runtime.Remoting"/>
|
<Reference name="System.Runtime.Remoting"/>
|
||||||
<Reference name="libsecondlife.dll"/>
|
<Reference name="libsecondlife.dll"/>
|
||||||
<Reference name="Axiom.MathLib.dll"/>
|
<Reference name="Axiom.MathLib.dll"/>
|
||||||
|
<Reference name="OpenSim"/>
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
<Reference name="OpenSim.Data" />
|
<Reference name="OpenSim.Data" />
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
|
|
Loading…
Reference in New Issue