From 07d0f558c441a0936441ed23ed076cf54a0dc578 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 9 Feb 2008 07:53:01 +0000 Subject: * 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 --- OpenSim/Region/ClientStack/ClientView.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/ClientStack/ClientView.cs') 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; -- cgit v1.1