aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/ClientView.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-09 07:53:01 +0000
committerTeravus Ovares2008-02-09 07:53:01 +0000
commit07d0f558c441a0936441ed23ed076cf54a0dc578 (patch)
treeb63c06f8975b904c1e792647b7e0bc045dfe2e7c /OpenSim/Region/ClientStack/ClientView.cs
parentMoved LICENSE.txt into root. (diff)
downloadopensim-SC_OLD-07d0f558c441a0936441ed23ed076cf54a0dc578.zip
opensim-SC_OLD-07d0f558c441a0936441ed23ed076cf54a0dc578.tar.gz
opensim-SC_OLD-07d0f558c441a0936441ed23ed076cf54a0dc578.tar.bz2
opensim-SC_OLD-07d0f558c441a0936441ed23ed076cf54a0dc578.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs14
1 files changed, 12 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
87 private readonly uint m_circuitCode; 87 private readonly uint m_circuitCode;
88 private int m_moneyBalance; 88 private int m_moneyBalance;
89 89
90 private readonly byte[] m_channelVersion = new byte[] { 0x00 }; // Dummy value needed by libSL 90 private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL
91 91
92 /* protected variables */ 92 /* protected variables */
93 93
@@ -196,6 +196,8 @@ namespace OpenSim.Region.ClientStack
196 { 196 {
197 m_moneyBalance = 1000; 197 m_moneyBalance = 1000;
198 198
199 m_channelVersion = Helpers.StringToField(scene.GetSimulatorVersion());
200
199 m_scene = scene; 201 m_scene = scene;
200 m_assetCache = assetCache; 202 m_assetCache = assetCache;
201 203
@@ -609,8 +611,16 @@ namespace OpenSim.Region.ClientStack
609 { 611 {
610 RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake); 612 RegionHandshakePacket handshake = (RegionHandshakePacket)PacketPool.Instance.GetPacket(PacketType.RegionHandshake);
611 613
614 bool estatemanager = false;
615 LLUUID[] EstateManagers = regionInfo.EstateSettings.estateManagers;
616 for (int i = 0; i < EstateManagers.Length; i++)
617 {
618 if (EstateManagers[i] == AgentId)
619 estatemanager = true;
620 }
621
612 handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor; 622 handshake.RegionInfo.BillableFactor = regionInfo.EstateSettings.billableFactor;
613 handshake.RegionInfo.IsEstateManager = false; 623 handshake.RegionInfo.IsEstateManager = estatemanager;
614 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.EstateSettings.terrainHeightRange0; 624 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.EstateSettings.terrainHeightRange0;
615 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.EstateSettings.terrainHeightRange1; 625 handshake.RegionInfo.TerrainHeightRange01 = regionInfo.EstateSettings.terrainHeightRange1;
616 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.EstateSettings.terrainHeightRange2; 626 handshake.RegionInfo.TerrainHeightRange10 = regionInfo.EstateSettings.terrainHeightRange2;