diff options
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 | } |