diff options
| author | Justin Clark-Casey | 2014-05-06 19:57:31 +0100 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-05-06 19:57:31 +0100 |
| commit | c38736de82321154252d9d3fcb3fd3d2250d633a (patch) | |
| tree | ebbf281ce9a309aec6b598213c210438b473e6e7 /OpenSim/Region/Framework | |
| parent | Change version flavour to RC1. Make version number more normal "0.8" rather ... (diff) | |
| parent | Revert "fix infinite recursion loop in SendGridInstantMessageViaXMLRPCAsync()" (diff) | |
| download | opensim-SC_OLD-c38736de82321154252d9d3fcb3fd3d2250d633a.zip opensim-SC_OLD-c38736de82321154252d9d3fcb3fd3d2250d633a.tar.gz opensim-SC_OLD-c38736de82321154252d9d3fcb3fd3d2250d633a.tar.bz2 opensim-SC_OLD-c38736de82321154252d9d3fcb3fd3d2250d633a.tar.xz | |
Merge branch 'master' into 0.8-post-fixes0.8-rc1
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 600ecfe..461c880 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
| 29 | using OpenSim.Framework; | ||
| 29 | using OpenSim.Services.Interfaces; | 30 | using OpenSim.Services.Interfaces; |
| 30 | 31 | ||
| 31 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
| @@ -44,6 +45,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 44 | 45 | ||
| 45 | string SetEstateOwner(int estateID, UserAccount account); | 46 | string SetEstateOwner(int estateID, UserAccount account); |
| 46 | string SetEstateName(int estateID, string newName); | 47 | string SetEstateName(int estateID, string newName); |
| 48 | string SetRegionEstate(RegionInfo regionInfo, int estateID); | ||
| 49 | string CreateEstate(string estateName, UUID ownerID); | ||
| 47 | 50 | ||
| 48 | /// <summary> | 51 | /// <summary> |
| 49 | /// Tell all clients about the current state of the region (terrain textures, water height, etc.). | 52 | /// Tell all clients about the current state of the region (terrain textures, water height, etc.). |