aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/EstateManager.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/EstateManager.cs33
1 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index c2c1ecf..b5a74ad 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -28,13 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.Framework.Types;
32using OpenSim.Framework.Interfaces;
33using OpenSim.Region.Environment;
34using OpenSim.Region.Environment.Scenes;
35using OpenSim;
36using libsecondlife; 31using libsecondlife;
37using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36using OpenSim.Region.Environment.Scenes;
38using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence; 37using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
39 38
40 39
@@ -79,30 +78,30 @@ namespace OpenSim.Region.Environment
79 case "setregioninfo": 78 case "setregioninfo":
80 if (packet.ParamList.Length != 9) 79 if (packet.ParamList.Length != 9)
81 { 80 {
82 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length"); 81 MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
83 } 82 }
84 else 83 else
85 { 84 {
86 m_regInfo.estateSettings.regionFlags = libsecondlife.Simulator.RegionFlags.None; 85 m_regInfo.estateSettings.regionFlags = Simulator.RegionFlags.None;
87 86
88 if (convertParamStringToBool(packet.ParamList[0].Parameter)) 87 if (convertParamStringToBool(packet.ParamList[0].Parameter))
89 { 88 {
90 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockTerraform; 89 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockTerraform;
91 } 90 }
92 91
93 if (convertParamStringToBool(packet.ParamList[1].Parameter)) 92 if (convertParamStringToBool(packet.ParamList[1].Parameter))
94 { 93 {
95 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.NoFly; 94 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.NoFly;
96 } 95 }
97 96
98 if (convertParamStringToBool(packet.ParamList[2].Parameter)) 97 if (convertParamStringToBool(packet.ParamList[2].Parameter))
99 { 98 {
100 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowDamage; 99 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowDamage;
101 } 100 }
102 101
103 if (convertParamStringToBool(packet.ParamList[3].Parameter) == false) 102 if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
104 { 103 {
105 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.BlockLandResell; 104 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.BlockLandResell;
106 } 105 }
107 106
108 107
@@ -113,17 +112,17 @@ namespace OpenSim.Region.Environment
113 m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor; 112 m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
114 113
115 int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter)); 114 int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
116 m_regInfo.estateSettings.simAccess = (libsecondlife.Simulator.SimAccess)tempMatureLevel; 115 m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;
117 116
118 117
119 if (convertParamStringToBool(packet.ParamList[7].Parameter)) 118 if (convertParamStringToBool(packet.ParamList[7].Parameter))
120 { 119 {
121 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.RestrictPushObject; 120 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.RestrictPushObject;
122 } 121 }
123 122
124 if (convertParamStringToBool(packet.ParamList[8].Parameter)) 123 if (convertParamStringToBool(packet.ParamList[8].Parameter))
125 { 124 {
126 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | libsecondlife.Simulator.RegionFlags.AllowParcelChanges; 125 m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags | Simulator.RegionFlags.AllowParcelChanges;
127 } 126 }
128 127
129 sendRegionInfoPacketToAll(); 128 sendRegionInfoPacketToAll();
@@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment
223 case "setregionterrain": 222 case "setregionterrain":
224 if (packet.ParamList.Length != 9) 223 if (packet.ParamList.Length != 9)
225 { 224 {
226 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length"); 225 MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
227 } 226 }
228 else 227 else
229 { 228 {
@@ -237,7 +236,7 @@ namespace OpenSim.Region.Environment
237 } 236 }
238 break; 237 break;
239 default: 238 default:
240 OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString()); 239 MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
241 break; 240 break;
242 } 241 }
243 } 242 }
@@ -265,7 +264,7 @@ namespace OpenSim.Region.Environment
265 264
266 public void sendRegionInfoPacket(IClientAPI remote_client) 265 public void sendRegionInfoPacket(IClientAPI remote_client)
267 { 266 {
268 Encoding _enc = System.Text.Encoding.ASCII; 267 Encoding _enc = Encoding.ASCII;
269 268
270 AgentCircuitData circuitData = remote_client.RequestClientInfo(); 269 AgentCircuitData circuitData = remote_client.RequestClientInfo();
271 270
generated by cgit v1.1 at 2024-12-21 05:21:46 +0000