aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDan Lake2012-02-03 15:21:37 -0800
committerDan Lake2012-02-03 15:21:37 -0800
commit4f8f44d9c3f42fbd841264fbede3e10ca253d016 (patch)
treee6e26d76ef58c9422a6cf030580c1f7377d7d931 /OpenSim/Framework
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
downloadopensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.zip
opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.gz
opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.bz2
opensim-SC_OLD-4f8f44d9c3f42fbd841264fbede3e10ca253d016.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/RegionSettings.cs10
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index dd3e656..c85e599 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1235,7 +1235,7 @@ namespace OpenSim.Framework
1235 void SendEstateCovenantInformation(UUID covenant); 1235 void SendEstateCovenantInformation(UUID covenant);
1236 1236
1237 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, 1237 void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags,
1238 uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); 1238 uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner);
1239 1239
1240 /// <summary> 1240 /// <summary>
1241 /// Send land properties to the client. 1241 /// Send land properties to the client.
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 91e07df..4ce3392 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -413,6 +413,14 @@ namespace OpenSim.Framework
413 set { m_Covenant = value; } 413 set { m_Covenant = value; }
414 } 414 }
415 415
416 private int m_CovenantChanged = 0;
417
418 public int CovenantChangedDateTime
419 {
420 get { return m_CovenantChanged; }
421 set { m_CovenantChanged = value; }
422 }
423
416 private int m_LoadedCreationDateTime; 424 private int m_LoadedCreationDateTime;
417 public int LoadedCreationDateTime 425 public int LoadedCreationDateTime
418 { 426 {
@@ -492,4 +500,4 @@ namespace OpenSim.Framework
492 l_SpawnPoints.Clear(); 500 l_SpawnPoints.Clear();
493 } 501 }
494 } 502 }
495} 503} \ No newline at end of file