diff options
| author | Melanie | 2013-05-08 20:59:44 +0100 |
|---|---|---|
| committer | Melanie | 2013-05-08 20:59:44 +0100 |
| commit | bda45650674eba7d69bbc262ebc28f2c5c184623 (patch) | |
| tree | 43fae3ed56116a8d6c941f011fa8f358c1295442 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Delete "" entry for AvatarPicker cap. (diff) | |
| download | opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.zip opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.gz opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.bz2 opensim-SC_OLD-bda45650674eba7d69bbc262ebc28f2c5c184623.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEstateModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index 292efa4..d49b24e 100644 --- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
| @@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 40 | 40 | ||
| 41 | uint GetRegionFlags(); | 41 | uint GetRegionFlags(); |
| 42 | bool IsManager(UUID avatarID); | 42 | bool IsManager(UUID avatarID); |
| 43 | 43 | ||
| 44 | /// <summary> | 44 | /// <summary> |
| 45 | /// Tell all clients about the current state of the region (terrain textures, water height, etc.). | 45 | /// Tell all clients about the current state of the region (terrain textures, water height, etc.). |
| 46 | /// </summary> | 46 | /// </summary> |