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/Dialog | |
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/Dialog')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index db5a788..0e7ab7e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces; | |||
40 | 40 | ||
41 | namespace OpenSim.Region.CoreModules.Avatar.Dialog | 41 | namespace OpenSim.Region.CoreModules.Avatar.Dialog |
42 | { | 42 | { |
43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 43 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DialogModule")] |
44 | public class DialogModule : IDialogModule, INonSharedRegionModule | 44 | public class DialogModule : IDialogModule, INonSharedRegionModule |
45 | { | 45 | { |
46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 46 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |