From 2e758172f019e3dc7300b2167a652a54e9f0c436 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Thu, 22 May 2008 00:18:33 +0000
Subject: * Fix circular dependency from last checkin by passing version as a
 parameter to Scene rather than referencing VersionInfo directly * Butt ugly
 solution

---
 OpenSim/Grid/ScriptServer/FakeScene.cs     |  2 +-
 OpenSim/Region/Application/OpenSimMain.cs  |  3 ++-
 OpenSim/Region/Environment/Scenes/Scene.cs | 12 ++++++------
 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
                          ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, bool sendTasksToChild, IConfigSource config)
             : base(
                 regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer,
-                moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config)
+                moduleLoader, dumpAssetsToFile, physicalPrim, sendTasksToChild, config, "")
         {
             
         }
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
             return
                 new Scene(regionInfo, circuitManager, m_commsManager, sceneGridService, m_assetCache,
                           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);
 
         }
 
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;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenJPEGNet;
-using OpenSim;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
@@ -87,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
         private int m_incrementsof15seconds = 0;
         private volatile bool m_backingup = false;
 
-        protected string m_simulatorVersion = VersionInfo.Version;
+        protected string m_simulatorVersion = "unknown"; 
 
         protected ModuleLoader m_moduleLoader;
         protected StorageManager m_storageManager;
@@ -220,7 +219,8 @@ namespace OpenSim.Region.Environment.Scenes
         public Scene(RegionInfo regInfo, AgentCircuitManager authen,
                      CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
                      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;
             updateLock = new Mutex(false);
@@ -308,9 +308,9 @@ namespace OpenSim.Region.Environment.Scenes
                 OSString = OSString.Substring(0, 45);
             }
 
-//            m_simulatorVersion += " on " + OSString 
-//                + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 
-//                + " PhysPrim:" + m_physicalPrim.ToString();
+            m_simulatorVersion = simulatorVersion + " on " + OSString 
+                + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() 
+                + " PhysPrim:" + m_physicalPrim.ToString();
         }
 
         #endregion
diff --git a/prebuild.xml b/prebuild.xml
index 4ec31fb..b2a2bd8 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -763,7 +763,6 @@
 	    <Reference name="System.Runtime.Remoting"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="Axiom.MathLib.dll"/>
-      <Reference name="OpenSim"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Data" />
       <Reference name="OpenSim.Framework.Console"/>
-- 
cgit v1.1