diff options
author | Melanie | 2012-11-11 16:31:01 +0000 |
---|---|---|
committer | Melanie | 2012-11-11 16:31:01 +0000 |
commit | 389077345f9fc78fddcaa39e29daa532a32815d6 (patch) | |
tree | a455d88d93ac5fe984ebf5342276ca1ddc831442 /OpenSim/Region/Framework/Interfaces/ICloudModule.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still I... (diff) | |
download | opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.zip opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.gz opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.bz2 opensim-SC-389077345f9fc78fddcaa39e29daa532a32815d6.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ICloudModule.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICloudModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs index 7296ac3..54172bd 100644 --- a/OpenSim/Region/Framework/Interfaces/ICloudModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICloudModule.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | namespace OpenSim.Region.Framework.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface ICloudModule : IRegionModule | 30 | public interface ICloudModule |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Retrieves the cloud density at the given region coordinates | 33 | /// Retrieves the cloud density at the given region coordinates |