aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDr Scofield2008-07-18 10:33:10 +0000
committerDr Scofield2008-07-18 10:33:10 +0000
commit3fb0a08619ef53d38bc7e64a7587de5b51b9b692 (patch)
tree7f221f7b53b870d0289e9e52d311d061fca87bcb /OpenSim
parentCommented out a readline that was preventing the sim from shutting down in so... (diff)
downloadopensim-SC_OLD-3fb0a08619ef53d38bc7e64a7587de5b51b9b692.zip
opensim-SC_OLD-3fb0a08619ef53d38bc7e64a7587de5b51b9b692.tar.gz
opensim-SC_OLD-3fb0a08619ef53d38bc7e64a7587de5b51b9b692.tar.bz2
opensim-SC_OLD-3fb0a08619ef53d38bc7e64a7587de5b51b9b692.tar.xz
fixing warnings in EstateSettings and correcting coding style:
* warning was: OpenSim/Framework/EstateSettings.cs(277): warning CS0472: The result of comparing `libsecondlife.LLUUID' against null is always `false'. This operation is undocumented and it is temporary supported for compatibility reasons only * coding style: space before flow control statements please! http://blogs.msdn.com/brada/articles/361363.aspx
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/EstateSettings.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index b48a1db..38c7bc3 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework
36{ 36{
37 public class EstateSettings 37 public class EstateSettings
38 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 private ConfigurationMember configMember; 40 private ConfigurationMember configMember;
41 41
42 public delegate void SaveDelegate(EstateSettings rs); 42 public delegate void SaveDelegate(EstateSettings rs);
@@ -268,21 +268,21 @@ namespace OpenSim.Framework
268 268
269 public void Save() 269 public void Save()
270 { 270 {
271 if(OnSave != null) 271 if (OnSave != null)
272 OnSave(this); 272 OnSave(this);
273 } 273 }
274 274
275 public void AddEstateManager(LLUUID avatarID) 275 public void AddEstateManager(LLUUID avatarID)
276 { 276 {
277 if(avatarID == null || avatarID == LLUUID.Zero) 277 if (avatarID == LLUUID.Zero)
278 return; 278 return;
279 if(!l_EstateManagers.Contains(avatarID)) 279 if (!l_EstateManagers.Contains(avatarID))
280 l_EstateManagers.Add(avatarID); 280 l_EstateManagers.Add(avatarID);
281 } 281 }
282 282
283 public void RemoveEstateManager(LLUUID avatarID) 283 public void RemoveEstateManager(LLUUID avatarID)
284 { 284 {
285 if(l_EstateManagers.Contains(avatarID)) 285 if (l_EstateManagers.Contains(avatarID))
286 l_EstateManagers.Remove(avatarID); 286 l_EstateManagers.Remove(avatarID);
287 } 287 }
288 288
@@ -294,16 +294,16 @@ namespace OpenSim.Framework
294 public bool IsBanned(LLUUID avatarID) 294 public bool IsBanned(LLUUID avatarID)
295 { 295 {
296 foreach (EstateBan ban in l_EstateBans) 296 foreach (EstateBan ban in l_EstateBans)
297 if(ban.bannedUUID == avatarID) 297 if (ban.bannedUUID == avatarID)
298 return true; 298 return true;
299 return false; 299 return false;
300 } 300 }
301 301
302 public void AddBan(EstateBan ban) 302 public void AddBan(EstateBan ban)
303 { 303 {
304 if(ban == null) 304 if (ban == null)
305 return; 305 return;
306 if(!IsBanned(ban.bannedUUID)) 306 if (!IsBanned(ban.bannedUUID))
307 l_EstateBans.Add(ban); 307 l_EstateBans.Add(ban);
308 } 308 }
309 309
@@ -315,7 +315,7 @@ namespace OpenSim.Framework
315 public void RemoveBan(LLUUID avatarID) 315 public void RemoveBan(LLUUID avatarID)
316 { 316 {
317 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans)) 317 foreach (EstateBan ban in new List<EstateBan>(l_EstateBans))
318 if(ban.bannedUUID == avatarID) 318 if (ban.bannedUUID == avatarID)
319 l_EstateBans.Remove(ban); 319 l_EstateBans.Remove(ban);
320 } 320 }
321 321
@@ -400,27 +400,27 @@ namespace OpenSim.Framework
400 { 400 {
401 case "region_flags": 401 case "region_flags":
402 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)configuration_result; 402 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)configuration_result;
403 if((flags & (Simulator.RegionFlags)(1<<29)) != 0) 403 if ((flags & (Simulator.RegionFlags)(1<<29)) != 0)
404 m_AllowVoice = true; 404 m_AllowVoice = true;
405 if((flags & Simulator.RegionFlags.AllowDirectTeleport) != 0) 405 if ((flags & Simulator.RegionFlags.AllowDirectTeleport) != 0)
406 m_AllowDirectTeleport = true; 406 m_AllowDirectTeleport = true;
407 if((flags & Simulator.RegionFlags.DenyAnonymous) != 0) 407 if ((flags & Simulator.RegionFlags.DenyAnonymous) != 0)
408 m_DenyAnonymous = true; 408 m_DenyAnonymous = true;
409 if((flags & Simulator.RegionFlags.DenyIdentified) != 0) 409 if ((flags & Simulator.RegionFlags.DenyIdentified) != 0)
410 m_DenyIdentified = true; 410 m_DenyIdentified = true;
411 if((flags & Simulator.RegionFlags.DenyTransacted) != 0) 411 if ((flags & Simulator.RegionFlags.DenyTransacted) != 0)
412 m_DenyTransacted = true; 412 m_DenyTransacted = true;
413 if((flags & Simulator.RegionFlags.AbuseEmailToEstateOwner) != 0) 413 if ((flags & Simulator.RegionFlags.AbuseEmailToEstateOwner) != 0)
414 m_AbuseEmailToEstateOwner = true; 414 m_AbuseEmailToEstateOwner = true;
415 if((flags & Simulator.RegionFlags.BlockDwell) != 0) 415 if ((flags & Simulator.RegionFlags.BlockDwell) != 0)
416 m_BlockDwell = true; 416 m_BlockDwell = true;
417 if((flags & Simulator.RegionFlags.EstateSkipScripts) != 0) 417 if ((flags & Simulator.RegionFlags.EstateSkipScripts) != 0)
418 m_EstateSkipScripts = true; 418 m_EstateSkipScripts = true;
419 if((flags & Simulator.RegionFlags.ResetHomeOnTeleport) != 0) 419 if ((flags & Simulator.RegionFlags.ResetHomeOnTeleport) != 0)
420 m_ResetHomeOnTeleport = true; 420 m_ResetHomeOnTeleport = true;
421 if((flags & Simulator.RegionFlags.TaxFree) != 0) 421 if ((flags & Simulator.RegionFlags.TaxFree) != 0)
422 m_TaxFree = true; 422 m_TaxFree = true;
423 if((flags & Simulator.RegionFlags.PublicAllowed) != 0) 423 if ((flags & Simulator.RegionFlags.PublicAllowed) != 0)
424 m_PublicAccess = true; 424 m_PublicAccess = true;
425 break; 425 break;
426 case "billable_factor": 426 case "billable_factor":