diff options
| author | Melanie | 2012-04-11 23:35:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-11 23:35:27 +0100 |
| commit | 4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753 (patch) | |
| tree | 28253aa39e6bf11e8f814d6818f727e5f27eb036 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | HGFriendsModule: Type casts to fix compile error (diff) | |
| download | opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.zip opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.gz opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.bz2 opensim-SC-4a67e8b98fd6ec2b2a7e390256e0c3ef7aa21753.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index 72e79ed..ca2ad94 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
| @@ -47,5 +47,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 47 | void sendRegionHandshakeToAll(); | 47 | void sendRegionHandshakeToAll(); |
| 48 | void TriggerEstateInfoChange(); | 48 | void TriggerEstateInfoChange(); |
| 49 | void TriggerRegionInfoChange(); | 49 | void TriggerRegionInfoChange(); |
| 50 | |||
| 51 | void setEstateTerrainBaseTexture(int level, UUID texture); | ||
| 52 | void setEstateTerrainTextureHeights(int corner, float lowValue, float highValue); | ||
| 50 | } | 53 | } |
| 51 | } | 54 | } |