diff options
author | Justin Clarke Casey | 2008-05-21 23:52:02 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-21 23:52:02 +0000 |
commit | 9263f07d7017a34edbea07a8f39c8936b4690f66 (patch) | |
tree | 4927c4860c605260be8622bbbcab84554b2f0fb9 /OpenSim/Region/Environment/Scenes | |
parent | * Deprecate load-xml and save-xml in favour of load-xml2/save-xml2. (diff) | |
download | opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.zip opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.gz opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.bz2 opensim-SC_OLD-9263f07d7017a34edbea07a8f39c8936b4690f66.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 250c884..a6042c3 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -35,6 +35,7 @@ using Axiom.Math; | |||
35 | using libsecondlife; | 35 | using libsecondlife; |
36 | using libsecondlife.Packets; | 36 | using libsecondlife.Packets; |
37 | using OpenJPEGNet; | 37 | using OpenJPEGNet; |
38 | using OpenSim; | ||
38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
40 | using OpenSim.Framework.Communications.Cache; | 41 | using OpenSim.Framework.Communications.Cache; |
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
86 | private int m_incrementsof15seconds = 0; | 87 | private int m_incrementsof15seconds = 0; |
87 | private volatile bool m_backingup = false; | 88 | private volatile bool m_backingup = false; |
88 | 89 | ||
89 | public string m_simulatorVersion = "OpenSimulator 0.5"; | 90 | protected string m_simulatorVersion = VersionInfo.Version; |
90 | 91 | ||
91 | protected ModuleLoader m_moduleLoader; | 92 | protected ModuleLoader m_moduleLoader; |
92 | protected StorageManager m_storageManager; | 93 | protected StorageManager m_storageManager; |
@@ -307,7 +308,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
307 | OSString = OSString.Substring(0, 45); | 308 | OSString = OSString.Substring(0, 45); |
308 | } | 309 | } |
309 | 310 | ||
310 | m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " PhysPrim:" + m_physicalPrim.ToString(); | 311 | // m_simulatorVersion += " on " + OSString |
312 | // + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | ||
313 | // + " PhysPrim:" + m_physicalPrim.ToString(); | ||
311 | } | 314 | } |
312 | 315 | ||
313 | #endregion | 316 | #endregion |