diff options
| author | Melanie | 2012-11-13 02:10:09 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-13 02:10:09 +0000 |
| commit | 9a5679876ed158f9944f209cbb68f370fabe8d12 (patch) | |
| tree | d5f282b13c448abec9f7329e88647cec459ede5f /OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.zip opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.gz opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.bz2 opensim-SC_OLD-9a5679876ed158f9944f209cbb68f370fabe8d12.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index e7a9f53..9fa9be1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
| @@ -55,7 +55,7 @@ using Mono.Addins; | |||
| 55 | 55 | ||
| 56 | namespace OpenSim.Region.CoreModules.Avatar.Gods | 56 | namespace OpenSim.Region.CoreModules.Avatar.Gods |
| 57 | { | 57 | { |
| 58 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 58 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "GodsModule")] |
| 59 | public class GodsModule : INonSharedRegionModule, IGodsModule | 59 | public class GodsModule : INonSharedRegionModule, IGodsModule |
| 60 | { | 60 | { |
| 61 | private static readonly ILog m_log = | 61 | private static readonly ILog m_log = |