Merge branch 'master' into careminster

Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
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/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.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
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 05d5577..986a665 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
        public OSDMap body;
    }
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EventQueueGetModule")]
    public class EventQueueGetModule : IEventQueue, INonSharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
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/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.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

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 05d5577..986a665 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ClientStack.Linden
55	public OSDMap body;	55	public OSDMap body;
56	}	56	}
57		57
58	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]	58	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "EventQueueGetModule")]
59	public class EventQueueGetModule : IEventQueue, INonSharedRegionModule	59	public class EventQueueGetModule : IEventQueue, INonSharedRegionModule
60	{	60	{
61	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);	61	private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);