diff options
| author | Melanie | 2012-02-04 11:48:20 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-04 11:48:20 +0000 |
| commit | ce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch) | |
| tree | c906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/Framework/IClientAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add default value to TelehubObject (diff) | |
| download | opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2 opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Framework/IClientAPI.cs')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index c4c61ff..5e156f1 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -1243,7 +1243,7 @@ namespace OpenSim.Framework | |||
| 1243 | void SendEstateCovenantInformation(UUID covenant); | 1243 | void SendEstateCovenantInformation(UUID covenant); |
| 1244 | 1244 | ||
| 1245 | void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, | 1245 | void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, |
| 1246 | uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner); | 1246 | uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner); |
| 1247 | 1247 | ||
| 1248 | /// <summary> | 1248 | /// <summary> |
| 1249 | /// Send land properties to the client. | 1249 | /// Send land properties to the client. |