diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEstateModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index ca2ad94..292efa4 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
| @@ -46,6 +46,10 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 46 | /// </summary> | 46 | /// </summary> |
| 47 | void sendRegionHandshakeToAll(); | 47 | void sendRegionHandshakeToAll(); |
| 48 | void TriggerEstateInfoChange(); | 48 | void TriggerEstateInfoChange(); |
| 49 | |||
| 50 | /// <summary> | ||
| 51 | /// Fires the OnRegionInfoChange event. | ||
| 52 | /// </summary> | ||
| 49 | void TriggerRegionInfoChange(); | 53 | void TriggerRegionInfoChange(); |
| 50 | 54 | ||
| 51 | void setEstateTerrainBaseTexture(int level, UUID texture); | 55 | void setEstateTerrainBaseTexture(int level, UUID texture); |