aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs14
2 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 34ad0f1..c715949 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2992,9 +2992,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2992 { 2992 {
2993 if (bl[i] == null) 2993 if (bl[i] == null)
2994 continue; 2994 continue;
2995 if (bl[i].bannedUUID == UUID.Zero) 2995 if (bl[i].BannedUserID == UUID.Zero)
2996 continue; 2996 continue;
2997 BannedUsers.Add(bl[i].bannedUUID); 2997 BannedUsers.Add(bl[i].BannedUserID);
2998 } 2998 }
2999 2999
3000 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket(); 3000 EstateOwnerMessagePacket packet = new EstateOwnerMessagePacket();
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index b567047..7a200d4 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
241 241
242 for (int i = 0; i < banlistcheck.Length; i++) 242 for (int i = 0; i < banlistcheck.Length; i++)
243 { 243 {
244 if (user == banlistcheck[i].bannedUUID) 244 if (user == banlistcheck[i].BannedUserID)
245 { 245 {
246 alreadyInList = true; 246 alreadyInList = true;
247 break; 247 break;
@@ -253,10 +253,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
253 253
254 EstateBan item = new EstateBan(); 254 EstateBan item = new EstateBan();
255 255
256 item.bannedUUID = user; 256 item.BannedUserID = user;
257 item.estateID = m_scene.RegionInfo.EstateSettings.EstateID; 257 item.EstateID = m_scene.RegionInfo.EstateSettings.EstateID;
258 item.bannedIP = "0.0.0.0"; 258 item.BannedHostAddress = "0.0.0.0";
259 item.bannedIPHostMask = "0.0.0.0"; 259 item.BannedHostIPMask = "0.0.0.0";
260 260
261 m_scene.RegionInfo.EstateSettings.AddBan(item); 261 m_scene.RegionInfo.EstateSettings.AddBan(item);
262 m_scene.RegionInfo.EstateSettings.Save(); 262 m_scene.RegionInfo.EstateSettings.Save();
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
294 294
295 for (int i = 0; i < banlistcheck.Length; i++) 295 for (int i = 0; i < banlistcheck.Length; i++)
296 { 296 {
297 if (user == banlistcheck[i].bannedUUID) 297 if (user == banlistcheck[i].BannedUserID)
298 { 298 {
299 alreadyInList = true; 299 alreadyInList = true;
300 listitem = banlistcheck[i]; 300 listitem = banlistcheck[i];
@@ -304,7 +304,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
304 } 304 }
305 if (alreadyInList && listitem != null) 305 if (alreadyInList && listitem != null)
306 { 306 {
307 m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.bannedUUID); 307 m_scene.RegionInfo.EstateSettings.RemoveBan(listitem.BannedUserID);
308 m_scene.RegionInfo.EstateSettings.Save(); 308 m_scene.RegionInfo.EstateSettings.Save();
309 } 309 }
310 else 310 else