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/ISunModule.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/ISunModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISunModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ISunModule.cs b/OpenSim/Region/Framework/Interfaces/ISunModule.cs index 819ae11..8231716 100644 --- a/OpenSim/Region/Framework/Interfaces/ISunModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISunModule.cs | |||
| @@ -29,7 +29,7 @@ using OpenMetaverse; | |||
| 29 | 29 | ||
| 30 | namespace OpenSim.Region.Framework.Interfaces | 30 | namespace OpenSim.Region.Framework.Interfaces |
| 31 | { | 31 | { |
| 32 | public interface ISunModule : IRegionModule | 32 | public interface ISunModule : INonSharedRegionModule |
| 33 | { | 33 | { |
| 34 | double GetSunParameter(string param); | 34 | double GetSunParameter(string param); |
| 35 | 35 | ||