aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-01 21:08:00 +0000
committerMelanie Thielker2008-08-01 21:08:00 +0000
commit12c5bfa3e0f42232035d74b3768ea98211dc5e18 (patch)
treec7dbdacf918345872ff633d282951b40797e04ff /OpenSim/Framework
parent* minor: add to the thread tracker the thread with which the thread tracker t... (diff)
downloadopensim-SC-12c5bfa3e0f42232035d74b3768ea98211dc5e18.zip
opensim-SC-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.gz
opensim-SC-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.bz2
opensim-SC-12c5bfa3e0f42232035d74b3768ea98211dc5e18.tar.xz
Estate series, patch 9 (#9157)
Adds the new access semantics and the new flag (allow only age verified) Plumbs in the abuse email address from sim to viewer. The other way around, libomv appears to be lacking support for the data field in the packet. Includes a migration, run prebuild!
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/EstateSettings.cs8
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
2 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 31655f4..8a00f9d 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -231,6 +231,14 @@ namespace OpenSim.Framework
231 set { m_EstateOwner = value; } 231 set { m_EstateOwner = value; }
232 } 232 }
233 233
234 private bool m_DenyMinors = false;
235
236 public bool DenyMinors
237 {
238 get { return m_DenyMinors; }
239 set { m_DenyMinors = value; }
240 }
241
234 // All those lists... 242 // All those lists...
235 // 243 //
236 private List<LLUUID> l_EstateManagers = new List<LLUUID>(); 244 private List<LLUUID> l_EstateManagers = new List<LLUUID>();
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 18e187b..8d50c30 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -642,7 +642,7 @@ namespace OpenSim.Framework
642 642
643 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args); 643 void SendRegionInfoToEstateMenu(RegionInfoForEstateMenuArgs args);
644 void SendEstateCovenantInformation(LLUUID covenant); 644 void SendEstateCovenantInformation(LLUUID covenant);
645 void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant); 645 void SendDetailedEstateData(LLUUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, LLUUID covenant, string abuseEmail);
646 646
647 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags); 647 void SendLandProperties(IClientAPI remote_client, int sequence_id, bool snap_selection, int request_result, LandData landData, float simObjectBonusFactor, int parcelObjectCapacity, int simObjectCapacity, uint regionFlags);
648 void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID); 648 void SendLandAccessListData(List<LLUUID> avatars, uint accessFlag, int localLandID);