aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2013-05-11 01:27:37 +0100
committerMelanie2013-05-11 01:27:37 +0100
commit81d8deb1a830765ec64948db5ec3902894761f24 (patch)
tree300a4abe329bf8cec3557dd390cca0b86063bf61 /OpenSim/Framework
parentGuard the scene list when estates are updated (diff)
downloadopensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.zip
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.gz
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.bz2
opensim-SC_OLD-81d8deb1a830765ec64948db5ec3902894761f24.tar.xz
Send up the part missing from the Avination Estate commit.
Warning - contains a small migration.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs34
1 files changed, 33 insertions, 1 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index a92abbf..a02993d 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -58,6 +58,30 @@ namespace OpenSim.Framework
58 set { m_EstateName = value; } 58 set { m_EstateName = value; }
59 } 59 }
60 60
61 private bool m_AllowLandmark = true;
62
63 public bool AllowLandmark
64 {
65 get { return m_AllowLandmark; }
66 set { m_AllowLandmark = value; }
67 }
68
69 private bool m_AllowParcelChanges = true;
70
71 public bool AllowParcelChanges
72 {
73 get { return m_AllowParcelChanges; }
74 set { m_AllowParcelChanges = value; }
75 }
76
77 private bool m_AllowSetHome = true;
78
79 public bool AllowSetHome
80 {
81 get { return m_AllowSetHome; }
82 set { m_AllowSetHome = value; }
83 }
84
61 private uint m_ParentEstateID = 1; 85 private uint m_ParentEstateID = 1;
62 86
63 public uint ParentEstateID 87 public uint ParentEstateID
@@ -374,10 +398,18 @@ namespace OpenSim.Framework
374 return l_EstateAccess.Contains(user); 398 return l_EstateAccess.Contains(user);
375 } 399 }
376 400
401 public void SetFromFlags(ulong regionFlags)
402 {
403 ResetHomeOnTeleport = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport) == (ulong)OpenMetaverse.RegionFlags.ResetHomeOnTeleport);
404 BlockDwell = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.BlockDwell) == (ulong)OpenMetaverse.RegionFlags.BlockDwell);
405 AllowLandmark = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowLandmark) == (ulong)OpenMetaverse.RegionFlags.AllowLandmark);
406 AllowParcelChanges = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges) == (ulong)OpenMetaverse.RegionFlags.AllowParcelChanges);
407 AllowSetHome = ((regionFlags & (ulong)OpenMetaverse.RegionFlags.AllowSetHome) == (ulong)OpenMetaverse.RegionFlags.AllowSetHome);
408 }
409
377 public bool GroupAccess(UUID groupID) 410 public bool GroupAccess(UUID groupID)
378 { 411 {
379 return l_EstateGroups.Contains(groupID); 412 return l_EstateGroups.Contains(groupID);
380 } 413 }
381
382 } 414 }
383} 415}