diff options
author | PixelTomsen | 2012-02-03 22:02:36 +0100 |
---|---|---|
committer | BlueWall | 2012-02-03 18:02:51 -0500 |
commit | 5c545d1d2e0a1862d063a1bdf80d2cd2fa311101 (patch) | |
tree | ddad500270bdd994d9852c657b0d2bf76ce7f7ac /OpenSim/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.zip opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.gz opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.bz2 opensim-SC_OLD-5c545d1d2e0a1862d063a1bdf80d2cd2fa311101.tar.xz |
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 10 |
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 |