diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/ScriptServer/FakeScene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 | ||||
-rw-r--r-- | prebuild.xml | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Grid/ScriptServer/FakeScene.cs b/OpenSim/Grid/ScriptServer/FakeScene.cs index 3dbb61a..89e7efb 100644 --- a/OpenSim/Grid/ScriptServer/FakeScene.cs +++ b/OpenSim/Grid/ScriptServer/FakeScene.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Grid.ScriptServer | |||
43 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool sendTasksToChild, IConfigSource config) | 43 | ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool sendTasksToChild, IConfigSource config) |
44 | : base( | 44 | : base( |
45 | regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, | 45 | regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, |
46 | moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config) | 46 | moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config, "") |
47 | { | 47 | { |
48 | 48 | ||
49 | } | 49 | } |
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; | |||
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 |
diff --git a/prebuild.xml b/prebuild.xml index 4ec31fb..b2a2bd8 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -763,7 +763,6 @@ | |||
763 | <Reference name="System.Runtime.Remoting"/> | 763 | <Reference name="System.Runtime.Remoting"/> |
764 | <Reference name="libsecondlife.dll"/> | 764 | <Reference name="libsecondlife.dll"/> |
765 | <Reference name="Axiom.MathLib.dll"/> | 765 | <Reference name="Axiom.MathLib.dll"/> |
766 | <Reference name="OpenSim"/> | ||
767 | <Reference name="OpenSim.Framework"/> | 766 | <Reference name="OpenSim.Framework"/> |
768 | <Reference name="OpenSim.Data" /> | 767 | <Reference name="OpenSim.Data" /> |
769 | <Reference name="OpenSim.Framework.Console"/> | 768 | <Reference name="OpenSim.Framework.Console"/> |