diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/EstateSettings.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 8b076fe..83f911d 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | 34 | ||
35 | namespace OpenSim.Framework | 35 | namespace OpenSim.Framework |
@@ -223,9 +223,9 @@ namespace OpenSim.Framework | |||
223 | set { m_AbuseEmail= value; } | 223 | set { m_AbuseEmail= value; } |
224 | } | 224 | } |
225 | 225 | ||
226 | private LLUUID m_EstateOwner = LLUUID.Zero; | 226 | private UUID m_EstateOwner = UUID.Zero; |
227 | 227 | ||
228 | public LLUUID EstateOwner | 228 | public UUID EstateOwner |
229 | { | 229 | { |
230 | get { return m_EstateOwner; } | 230 | get { return m_EstateOwner; } |
231 | set { m_EstateOwner = value; } | 231 | set { m_EstateOwner = value; } |
@@ -241,12 +241,12 @@ namespace OpenSim.Framework | |||
241 | 241 | ||
242 | // All those lists... | 242 | // All those lists... |
243 | // | 243 | // |
244 | private List<LLUUID> l_EstateManagers = new List<LLUUID>(); | 244 | private List<UUID> l_EstateManagers = new List<UUID>(); |
245 | 245 | ||
246 | public LLUUID[] EstateManagers | 246 | public UUID[] EstateManagers |
247 | { | 247 | { |
248 | get { return l_EstateManagers.ToArray(); } | 248 | get { return l_EstateManagers.ToArray(); } |
249 | set { l_EstateManagers = new List<LLUUID>(value); } | 249 | set { l_EstateManagers = new List<UUID>(value); } |
250 | } | 250 | } |
251 | 251 | ||
252 | private List<EstateBan> l_EstateBans = new List<EstateBan>(); | 252 | private List<EstateBan> l_EstateBans = new List<EstateBan>(); |
@@ -257,20 +257,20 @@ namespace OpenSim.Framework | |||
257 | set { l_EstateBans = new List<EstateBan>(value); } | 257 | set { l_EstateBans = new List<EstateBan>(value); } |
258 | } | 258 | } |
259 | 259 | ||
260 | private List<LLUUID> l_EstateAccess = new List<LLUUID>(); | 260 | private List<UUID> l_EstateAccess = new List<UUID>(); |
261 | 261 | ||
262 | public LLUUID[] EstateAccess | 262 | public UUID[] EstateAccess |
263 | { | 263 | { |
264 | get { return l_EstateAccess.ToArray(); } | 264 | get { return l_EstateAccess.ToArray(); } |
265 | set { l_EstateAccess = new List<LLUUID>(value); } | 265 | set { l_EstateAccess = new List<UUID>(value); } |
266 | } | 266 | } |
267 | 267 | ||
268 | private List<LLUUID> l_EstateGroups = new List<LLUUID>(); | 268 | private List<UUID> l_EstateGroups = new List<UUID>(); |
269 | 269 | ||
270 | public LLUUID[] EstateGroups | 270 | public UUID[] EstateGroups |
271 | { | 271 | { |
272 | get { return l_EstateGroups.ToArray(); } | 272 | get { return l_EstateGroups.ToArray(); } |
273 | set { l_EstateGroups = new List<LLUUID>(value); } | 273 | set { l_EstateGroups = new List<UUID>(value); } |
274 | } | 274 | } |
275 | 275 | ||
276 | public EstateSettings() | 276 | public EstateSettings() |
@@ -281,7 +281,7 @@ namespace OpenSim.Framework | |||
281 | // | 281 | // |
282 | configMember = | 282 | configMember = |
283 | new ConfigurationMember(Path.Combine(Util.configDir(), | 283 | new ConfigurationMember(Path.Combine(Util.configDir(), |
284 | "estate_settings.xml"), "ESTATE SETTINGS", | 284 | "estate_settings.Xml"), "ESTATE SETTINGS", |
285 | loadConfigurationOptions, | 285 | loadConfigurationOptions, |
286 | handleIncomingConfiguration, true); | 286 | handleIncomingConfiguration, true); |
287 | 287 | ||
@@ -296,21 +296,21 @@ namespace OpenSim.Framework | |||
296 | OnSave(this); | 296 | OnSave(this); |
297 | } | 297 | } |
298 | 298 | ||
299 | public void AddEstateManager(LLUUID avatarID) | 299 | public void AddEstateManager(UUID avatarID) |
300 | { | 300 | { |
301 | if (avatarID == LLUUID.Zero) | 301 | if (avatarID == UUID.Zero) |
302 | return; | 302 | return; |
303 | if (!l_EstateManagers.Contains(avatarID)) | 303 | if (!l_EstateManagers.Contains(avatarID)) |
304 | l_EstateManagers.Add(avatarID); | 304 | l_EstateManagers.Add(avatarID); |
305 | } | 305 | } |
306 | 306 | ||
307 | public void RemoveEstateManager(LLUUID avatarID) | 307 | public void RemoveEstateManager(UUID avatarID) |
308 | { | 308 | { |
309 | if (l_EstateManagers.Contains(avatarID)) | 309 | if (l_EstateManagers.Contains(avatarID)) |
310 | l_EstateManagers.Remove(avatarID); | 310 | l_EstateManagers.Remove(avatarID); |
311 | } | 311 | } |
312 | 312 | ||
313 | public bool IsEstateManager(LLUUID avatarID) | 313 | public bool IsEstateManager(UUID avatarID) |
314 | { | 314 | { |
315 | if (IsEstateOwner(avatarID)) | 315 | if (IsEstateOwner(avatarID)) |
316 | return true; | 316 | return true; |
@@ -318,7 +318,7 @@ namespace OpenSim.Framework | |||
318 | return l_EstateManagers.Contains(avatarID); | 318 | return l_EstateManagers.Contains(avatarID); |
319 | } | 319 | } |
320 | 320 | ||
321 | public bool IsEstateOwner(LLUUID avatarID) | 321 | public bool IsEstateOwner(UUID avatarID) |
322 | { | 322 | { |
323 | if (avatarID == m_EstateOwner) | 323 | if (avatarID == m_EstateOwner) |
324 | return true; | 324 | return true; |
@@ -326,7 +326,7 @@ namespace OpenSim.Framework | |||
326 | return false; | 326 | return false; |
327 | } | 327 | } |
328 | 328 | ||
329 | public bool IsBanned(LLUUID avatarID) | 329 | public bool IsBanned(UUID avatarID) |
330 | { | 330 | { |
331 | foreach (EstateBan ban in l_EstateBans) | 331 | foreach (EstateBan ban in l_EstateBans) |
332 | if (ban.bannedUUID == avatarID) | 332 | if (ban.bannedUUID == avatarID) |
@@ -347,7 +347,7 @@ namespace OpenSim.Framework | |||
347 | l_EstateBans.Clear(); | 347 | l_EstateBans.Clear(); |
348 | } | 348 | } |
349 | 349 | ||
350 | public void RemoveBan(LLUUID avatarID) | 350 | public void RemoveBan(UUID avatarID) |
351 | { | 351 | { |
352 | foreach (EstateBan ban in new List<EstateBan>(l_EstateBans)) | 352 | foreach (EstateBan ban in new List<EstateBan>(l_EstateBans)) |
353 | if (ban.bannedUUID == avatarID) | 353 | if (ban.bannedUUID == avatarID) |
@@ -385,43 +385,43 @@ namespace OpenSim.Framework | |||
385 | String.Empty, "My Estate", true); | 385 | String.Empty, "My Estate", true); |
386 | 386 | ||
387 | configMember.addConfigurationOption("estate_manager_0", | 387 | configMember.addConfigurationOption("estate_manager_0", |
388 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 388 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
389 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 389 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
390 | 390 | ||
391 | configMember.addConfigurationOption("estate_manager_1", | 391 | configMember.addConfigurationOption("estate_manager_1", |
392 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 392 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
393 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 393 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
394 | 394 | ||
395 | configMember.addConfigurationOption("estate_manager_2", | 395 | configMember.addConfigurationOption("estate_manager_2", |
396 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 396 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
397 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 397 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
398 | 398 | ||
399 | configMember.addConfigurationOption("estate_manager_3", | 399 | configMember.addConfigurationOption("estate_manager_3", |
400 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 400 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
401 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 401 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
402 | 402 | ||
403 | configMember.addConfigurationOption("estate_manager_4", | 403 | configMember.addConfigurationOption("estate_manager_4", |
404 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 404 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
405 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 405 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
406 | 406 | ||
407 | configMember.addConfigurationOption("estate_manager_5", | 407 | configMember.addConfigurationOption("estate_manager_5", |
408 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 408 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
409 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 409 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
410 | 410 | ||
411 | configMember.addConfigurationOption("estate_manager_6", | 411 | configMember.addConfigurationOption("estate_manager_6", |
412 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 412 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
413 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 413 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
414 | 414 | ||
415 | configMember.addConfigurationOption("estate_manager_7", | 415 | configMember.addConfigurationOption("estate_manager_7", |
416 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 416 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
417 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 417 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
418 | 418 | ||
419 | configMember.addConfigurationOption("estate_manager_8", | 419 | configMember.addConfigurationOption("estate_manager_8", |
420 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 420 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
421 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 421 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
422 | 422 | ||
423 | configMember.addConfigurationOption("estate_manager_9", | 423 | configMember.addConfigurationOption("estate_manager_9", |
424 | ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, | 424 | ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
425 | String.Empty, "00000000-0000-0000-0000-000000000000", true); | 425 | String.Empty, "00000000-0000-0000-0000-000000000000", true); |
426 | 426 | ||
427 | configMember.addConfigurationOption("region_flags", | 427 | configMember.addConfigurationOption("region_flags", |
@@ -480,34 +480,34 @@ namespace OpenSim.Framework | |||
480 | m_EstateName = (string) configuration_result; | 480 | m_EstateName = (string) configuration_result; |
481 | break; | 481 | break; |
482 | case "estate_manager_0": | 482 | case "estate_manager_0": |
483 | AddEstateManager((LLUUID)configuration_result); | 483 | AddEstateManager((UUID)configuration_result); |
484 | break; | 484 | break; |
485 | case "estate_manager_1": | 485 | case "estate_manager_1": |
486 | AddEstateManager((LLUUID)configuration_result); | 486 | AddEstateManager((UUID)configuration_result); |
487 | break; | 487 | break; |
488 | case "estate_manager_2": | 488 | case "estate_manager_2": |
489 | AddEstateManager((LLUUID)configuration_result); | 489 | AddEstateManager((UUID)configuration_result); |
490 | break; | 490 | break; |
491 | case "estate_manager_3": | 491 | case "estate_manager_3": |
492 | AddEstateManager((LLUUID)configuration_result); | 492 | AddEstateManager((UUID)configuration_result); |
493 | break; | 493 | break; |
494 | case "estate_manager_4": | 494 | case "estate_manager_4": |
495 | AddEstateManager((LLUUID)configuration_result); | 495 | AddEstateManager((UUID)configuration_result); |
496 | break; | 496 | break; |
497 | case "estate_manager_5": | 497 | case "estate_manager_5": |
498 | AddEstateManager((LLUUID)configuration_result); | 498 | AddEstateManager((UUID)configuration_result); |
499 | break; | 499 | break; |
500 | case "estate_manager_6": | 500 | case "estate_manager_6": |
501 | AddEstateManager((LLUUID)configuration_result); | 501 | AddEstateManager((UUID)configuration_result); |
502 | break; | 502 | break; |
503 | case "estate_manager_7": | 503 | case "estate_manager_7": |
504 | AddEstateManager((LLUUID)configuration_result); | 504 | AddEstateManager((UUID)configuration_result); |
505 | break; | 505 | break; |
506 | case "estate_manager_8": | 506 | case "estate_manager_8": |
507 | AddEstateManager((LLUUID)configuration_result); | 507 | AddEstateManager((UUID)configuration_result); |
508 | break; | 508 | break; |
509 | case "estate_manager_9": | 509 | case "estate_manager_9": |
510 | AddEstateManager((LLUUID)configuration_result); | 510 | AddEstateManager((UUID)configuration_result); |
511 | break; | 511 | break; |
512 | } | 512 | } |
513 | 513 | ||