Merge branch 'master' into connector_plugin

Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
author: BlueWall 2012-11-25 17:03:14 -0500
committer: BlueWall 2012-11-25 17:03:14 -0500
commit: c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree: dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
parent: Merge branch 'master' into connector_plugin (diff)
parent: Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download: opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2
opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 9c838d0..8f04ede 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
    ///
    /// </summary>
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SampleMoneyModule")]
    public class SampleMoneyModule : IMoneyModule, ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
author	BlueWall	2012-11-25 17:03:14 -0500
committer	BlueWall	2012-11-25 17:03:14 -0500
commit	c754003944d0166bf50b4f94b0c0eea642503bb0 (patch)
tree	dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
parent	Merge branch 'master' into connector_plugin (diff)
parent	Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff)
download	opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 9c838d0..8f04ede 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule
55	///	55	///
56	/// </summary>	56	/// </summary>
57		57
58	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]	58	[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SampleMoneyModule")]
59	public class SampleMoneyModule : IMoneyModule, ISharedRegionModule	59	public class SampleMoneyModule : IMoneyModule, ISharedRegionModule
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);