* Fixed nebadon's UserServer crash bug from yesterday.

* Made Estate tools work for estate managers without needing to request admin status First
* Added code to make the Simulator version to be reported in the About box of the client

3 files changed, 40 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 1717825..d7f4c3d 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.ClientStack
         private readonly uint m_circuitCode;
         private int m_moneyBalance;
 
-        private readonly byte[] m_channelVersion = new byte[] { 0x00 }; // Dummy value needed by libSL
+        private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL
 
         /* protected variables */
 
@@ -196,6 +196,8 @@ namespace OpenSim.Region.ClientStack
         {
             m_moneyBalance = 1000;
 
+            m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
+
             m_scene = scene;
             m_assetCache = assetCache;
 
@@ -609,8 +611,16 @@ namespace OpenSim.Region.ClientStack
         {
             RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake);
 
+            bool estatemanager = false;
+            LLUUID[] EstateManagers = regionInfo.EstateSettings.estateManagers;
+            for (int i = 0; i < EstateManagers.Length; i++)
+            {
+                if (EstateManagers[i] == AgentId)
+                    estatemanager = true;
+            }
+
             handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor;
-            handshake.RegionInfo.IsEstateManager = false;
+            handshake.RegionInfo.IsEstateManager = estatemanager;
             handshake.RegionInfo.TerrainHeightRange00 = regionInfo.EstateSettings.terrainHeightRange0;
             handshake.RegionInfo.TerrainHeightRange01 = regionInfo.EstateSettings.terrainHeightRange1;
             handshake.RegionInfo.TerrainHeightRange10 = regionInfo.EstateSettings.terrainHeightRange2;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3fafaf4..a4f5028 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -82,6 +82,8 @@ namespace OpenSim.Region.Environment.Scenes
         private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing
         private int m_incrementsof15seconds = 0;
 
+        public string m_simulatorVersion = "OpenSimulator 0.5";
+
         protected ModuleLoader m_moduleLoader;
         protected StorageManager m_storageManager;
         protected AgentCircuitManager m_authenticateHandler;
@@ -300,6 +302,22 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_statsReporter = new SimStatsReporter(regInfo);
             m_statsReporter.OnSendStatsResult += SendSimStatsPackets;
+            string OSString = "";
+
+            if (System.Environment.OSVersion.Platform != PlatformID.Unix)
+            {
+                OSString = System.Environment.OSVersion.ToString();
+            }
+            else 
+            {
+                OSString = Util.ReadEtcIssue();
+            }
+            if (OSString.Length > 45)
+            {
+                OSString = OSString.Substring(0,45);
+            }
+
+            m_simulatorVersion = "OpenSimulator v0.5-SVN on " + OSString + " ChilTasks:" + m_sendTasksToChild.ToString() + " PhysPrim:" + m_physicalPrim.ToString();
         }
 
         #endregion
@@ -313,6 +331,11 @@ namespace OpenSim.Region.Environment.Scenes
             m_eventManager.OnPermissionError += SendPermissionAlert;
         }
 
+        public override string GetSimulatorVersion()
+        {
+            return m_simulatorVersion;
+        }
+
         public override bool OtherRegionUp(RegionInfo otherRegion)
         {
             // Another region is up.  
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 2e95322..e39fa9f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -167,6 +167,11 @@ namespace OpenSim.Region.Environment.Scenes
         }
         public abstract bool OtherRegionUp(RegionInfo thisRegion);
 
+        public virtual string GetSimulatorVersion()
+        {
+            return "OpenSimulator v0.5 SVN";
+        }
+
         #endregion
 
         #region Shutdown