OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix circular dependency from last checkin by passing version as a parameter to Scene rather than referencing VersionInfo directly 

* Butt ugly solution
0.6.0-stable
Justin Clarke Casey 2008-05-22 00:18:33 +00:00
parent 9263f07d70
commit 2e758172f0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/ScriptServer/FakeScene.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Grid.ScriptServer
ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool sendTasksToChild, IConfigSource config) ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool sendTasksToChild, IConfigSource config)
: base( : base(
regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer,
moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config) moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config, "")
{ {
} }

3
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -622,7 +622,8 @@ namespace OpenSim
return return
new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache, new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
storageManager, m_httpServer, storageManager, m_httpServer,
m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config); m_moduleLoader, m_dumpAssetsToFile, m_physicalPrim, m_see_into_region_from_neighbor, m_config,
VersionInfo.Version);
} }

12
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -35,7 +35,6 @@ 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;
@ -87,7 +86,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;
protected string m_simulatorVersion = VersionInfo.Version; protected string m_simulatorVersion = "unknown";
protected ModuleLoader m_moduleLoader; protected ModuleLoader m_moduleLoader;
protected StorageManager m_storageManager; protected StorageManager m_storageManager;
@ -220,7 +219,8 @@ namespace OpenSim.Region.Environment.Scenes
public Scene(RegionInfo regInfo, AgentCircuitManager authen, public Scene(RegionInfo regInfo, AgentCircuitManager authen,
CommunicationsManager commsMan, SceneCommunicationService sceneGridService, CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer,
ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool SeeIntoRegionFromNeighbor, IConfigSource config) ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
{ {
m_config = config; m_config = config;
updateLock = new Mutex(false); updateLock = new Mutex(false);
@ -308,9 +308,9 @@ namespace OpenSim.Region.Environment.Scenes
OSString = OSString.Substring(0, 45); OSString = OSString.Substring(0, 45);
} }
// m_simulatorVersion += " on " + OSString m_simulatorVersion = simulatorVersion + " on " + OSString
// + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString()
// + " PhysPrim:" + m_physicalPrim.ToString(); + " PhysPrim:" + m_physicalPrim.ToString();
} }
#endregion #endregion

1
prebuild.xml
View File

@ -763,7 +763,6 @@
<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"/>