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/Region/OptionalModules | |
| 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 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 11f927c..c928af7 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1243,7 +1243,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1243 | 1243 | ||
| 1244 | } | 1244 | } |
| 1245 | 1245 | ||
| 1246 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 1246 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
| 1247 | { | 1247 | { |
| 1248 | 1248 | ||
| 1249 | } | 1249 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 81bf9ed..be0d56e 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -933,7 +933,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 933 | public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) | 933 | public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint) |
| 934 | { | 934 | { |
| 935 | } | 935 | } |
| 936 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) | 936 | public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner) |
| 937 | { | 937 | { |
| 938 | } | 938 | } |
| 939 | 939 | ||