aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-05-22 00:18:33 +0000
committerJustin Clarke Casey2008-05-22 00:18:33 +0000
commit2e758172f019e3dc7300b2167a652a54e9f0c436 (patch)
treeff35ade667b152f1a9f0377f920e7d49a3f02838 /OpenSim/Region
parent* Send VersionInfo string instead of the hardcoded Scene string to the "About... (diff)
downloadopensim-SC_OLD-2e758172f019e3dc7300b2167a652a54e9f0c436.zip
opensim-SC_OLD-2e758172f019e3dc7300b2167a652a54e9f0c436.tar.gz
opensim-SC_OLD-2e758172f019e3dc7300b2167a652a54e9f0c436.tar.bz2
opensim-SC_OLD-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 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
2 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index a48b580..4031634 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -622,7 +622,8 @@ namespace OpenSim
622 return 622 return
623 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, 623 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
624 storageManager, m_httpServer, 624 storageManager, m_httpServer,
625 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config); 625 m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config,
626 VersionInfo.Version);
626 627
627 } 628 }
628 629
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;
35using libsecondlife; 35using libsecondlife;
36using libsecondlife.Packets; 36using libsecondlife.Packets;
37using OpenJPEGNet; 37using OpenJPEGNet;
38using OpenSim;
39using OpenSim.Framework; 38using OpenSim.Framework;
40using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 40using 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