diff options
author | Justin Clarke Casey | 2008-05-22 00:18:33 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-22 00:18:33 +0000 |
commit | 2e758172f019e3dc7300b2167a652a54e9f0c436 (patch) | |
tree | ff35ade667b152f1a9f0377f920e7d49a3f02838 /OpenSim/Region/Environment | |
parent | * Send VersionInfo string instead of the hardcoded Scene string to the "About... (diff) | |
download | opensim-SC-2e758172f019e3dc7300b2167a652a54e9f0c436.zip opensim-SC-2e758172f019e3dc7300b2167a652a54e9f0c436.tar.gz opensim-SC-2e758172f019e3dc7300b2167a652a54e9f0c436.tar.bz2 opensim-SC-2e758172f019e3dc7300b2167a652a54e9f0c436.tar.xz |
* Fix circular dependency from last checkin by passing version as a parameter to Scene rather than referencing VersionInfo directly
* Butt ugly solution
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index a6042c3..a980ce1 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -35,7 +35,6 @@ 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; | ||
39 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Framework.Communications.Cache; | 40 | using OpenSim.Framework.Communications.Cache; |
@@ -87,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
87 | private int m_incrementsof15seconds = 0; | 86 | private int m_incrementsof15seconds = 0; |
88 | private volatile bool m_backingup = false; | 87 | private volatile bool m_backingup = false; |
89 | 88 | ||
90 | protected string m_simulatorVersion = VersionInfo.Version; | 89 | protected string m_simulatorVersion = "unknown"; |
91 | 90 | ||
92 | protected ModuleLoader m_moduleLoader; | 91 | protected ModuleLoader m_moduleLoader; |
93 | protected StorageManager m_storageManager; | 92 | protected StorageManager m_storageManager; |
@@ -220,7 +219,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
220 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, | 219 | public Scene(RegionInfo regInfo, AgentCircuitManager authen, |
221 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, | 220 | CommunicationsManager commsMan, SceneCommunicationService sceneGridService, |
222 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, | 221 | AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, |
223 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config) | 222 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, |
223 | bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) | ||
224 | { | 224 | { |
225 | m_config = config; | 225 | m_config = config; |
226 | updateLock = new Mutex(false); | 226 | updateLock = new Mutex(false); |
@@ -308,9 +308,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
308 | OSString = OSString.Substring(0, 45); | 308 | OSString = OSString.Substring(0, 45); |
309 | } | 309 | } |
310 | 310 | ||
311 | // m_simulatorVersion += " on " + OSString | 311 | m_simulatorVersion = simulatorVersion + " on " + OSString |
312 | // + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 312 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
313 | // + " PhysPrim:" + m_physicalPrim.ToString(); | 313 | + " PhysPrim:" + m_physicalPrim.ToString(); |
314 | } | 314 | } |
315 | 315 | ||
316 | #endregion | 316 | #endregion |