aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs41
1 files changed, 2 insertions, 39 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index e899947..ee64bf2 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -193,7 +193,6 @@ namespace OpenSim.Framework
193 193
194 public bool commFailTF = false; 194 public bool commFailTF = false;
195 public ConfigurationMember configMember; 195 public ConfigurationMember configMember;
196 public LLUUID CovenantID = LLUUID.Zero;
197 public string DataStore = String.Empty; 196 public string DataStore = String.Empty;
198 public bool isSandbox = false; 197 public bool isSandbox = false;
199 private EstateSettings m_estateSettings; 198 private EstateSettings m_estateSettings;
@@ -212,7 +211,6 @@ namespace OpenSim.Framework
212 211
213 public LLUUID lastMapUUID = LLUUID.Zero; 212 public LLUUID lastMapUUID = LLUUID.Zero;
214 public string lastMapRefresh = "0"; 213 public string lastMapRefresh = "0";
215 public List<RegionBanListItem> regionBanlist = new List<RegionBanListItem>();
216 214
217 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 215 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
218 216
@@ -279,6 +277,8 @@ namespace OpenSim.Framework
279 277
280 return m_estateSettings; 278 return m_estateSettings;
281 } 279 }
280
281 set { m_estateSettings = value; }
282 } 282 }
283 283
284 public RegionSettings RegionSettings 284 public RegionSettings RegionSettings
@@ -364,28 +364,6 @@ namespace OpenSim.Framework
364 configMember.performConfigurationRetrieve(); 364 configMember.performConfigurationRetrieve();
365 } 365 }
366 366
367 public bool CheckIfUserBanned(LLUUID user)
368 {
369
370 RegionBanListItem[] bl = regionBanlist.ToArray();
371
372 bool banned = false;
373
374 for (int i = 0; i < bl.Length; i++)
375 {
376 if (bl[i] == null)
377 continue;
378
379 if (bl[i].bannedUUID == user)
380 {
381 banned = true;
382 break;
383 }
384 }
385
386 return banned;
387 }
388
389 public void loadConfigurationOptionsFromMe() 367 public void loadConfigurationOptionsFromMe()
390 { 368 {
391 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE, 369 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID_NULL_FREE,
@@ -415,9 +393,6 @@ namespace OpenSim.Framework
415 "External Host Name", m_externalHostName, true); 393 "External Host Name", m_externalHostName, true);
416 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 394 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
417 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true); 395 "Master Avatar UUID", MasterAvatarAssignedUUID.ToString(), true);
418 configMember.addConfigurationOption("estate_covanant_uuid",
419 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant",
420 CovenantID.ToString(), true);
421 configMember.addConfigurationOption("master_avatar_first", 396 configMember.addConfigurationOption("master_avatar_first",
422 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 397 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
423 "First Name of Master Avatar", MasterAvatarFirstName, true); 398 "First Name of Master Avatar", MasterAvatarFirstName, true);
@@ -461,9 +436,6 @@ namespace OpenSim.Framework
461 "External Host Name", "127.0.0.1", false); 436 "External Host Name", "127.0.0.1", false);
462 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, 437 configMember.addConfigurationOption("master_avatar_uuid", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
463 "Master Avatar UUID", LLUUID.Zero.ToString(), true); 438 "Master Avatar UUID", LLUUID.Zero.ToString(), true);
464 configMember.addConfigurationOption("estate_covanant_uuid",
465 ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "Estate Covenant",
466 LLUUID.Zero.ToString(), true);
467 configMember.addConfigurationOption("master_avatar_first", 439 configMember.addConfigurationOption("master_avatar_first",
468 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 440 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
469 "First Name of Master Avatar", "Test", false, 441 "First Name of Master Avatar", "Test", false,
@@ -538,10 +510,6 @@ namespace OpenSim.Framework
538 case "master_avatar_uuid": 510 case "master_avatar_uuid":
539 MasterAvatarAssignedUUID = (LLUUID) configuration_result; 511 MasterAvatarAssignedUUID = (LLUUID) configuration_result;
540 break; 512 break;
541 case "estate_covanant_uuid":
542 CovenantID = (LLUUID) configuration_result;
543 break;
544
545 case "master_avatar_first": 513 case "master_avatar_first":
546 MasterAvatarFirstName = (string) configuration_result; 514 MasterAvatarFirstName = (string) configuration_result;
547 break; 515 break;
@@ -563,11 +531,6 @@ namespace OpenSim.Framework
563 return true; 531 return true;
564 } 532 }
565 533
566 public void SaveEstatecovenantUUID(LLUUID notecard)
567 {
568 if (null == configMember) return;
569 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString());
570 }
571 public void SaveLastMapUUID(LLUUID mapUUID) 534 public void SaveLastMapUUID(LLUUID mapUUID)
572 { 535 {
573 if (null == configMember) return; 536 if (null == configMember) return;