Merge branch 'master' of git://opensimulator.org/git/opensim

author: Sean Dague 2009-08-06 14:03:16 -0400
committer: Sean Dague 2009-08-06 14:03:16 -0400
commit: 4078a331e2e851c051293472776ebebcc5dbaecc (patch)
tree: c172fb9173821f9a30d37ee336f6592ccaf4510f /OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
parent: skip sqlite tests on z linux, as sqlite doesn't work right on the platform (diff)
parent: Add the config-include statement to OpenSim.ini.example. (diff)
download: opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.zip
opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.gz
opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.bz2
opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.xz
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
index 5471f9e..696f915 100644
--- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
+++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -41,9 +41,6 @@ using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-[assembly: Addin("SampleMoneyModule", "0.1")]
-[assembly: AddinDependency("OpenSim", "0.5")]
 namespace OpenSim.Region.OptionalModules.World.MoneyModule
 {
    /// <summary>
author	Sean Dague	2009-08-06 14:03:16 -0400
committer	Sean Dague	2009-08-06 14:03:16 -0400
commit	4078a331e2e851c051293472776ebebcc5dbaecc (patch)
tree	c172fb9173821f9a30d37ee336f6592ccaf4510f /OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
parent	skip sqlite tests on z linux, as sqlite doesn't work right on the platform (diff)
parent	Add the config-include statement to OpenSim.ini.example. (diff)
download	opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.zip opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.gz opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.bz2 opensim-SC-4078a331e2e851c051293472776ebebcc5dbaecc.tar.xz

diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 5471f9e..696f915 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
@@ -41,9 +41,6 @@ using OpenSim.Framework.Servers.HttpServer;
41	using OpenSim.Region.Framework.Interfaces;	41	using OpenSim.Region.Framework.Interfaces;
42	using OpenSim.Region.Framework.Scenes;	42	using OpenSim.Region.Framework.Scenes;
43		43
44	[assembly: Addin("SampleMoneyModule", "0.1")]
45	[assembly: AddinDependency("OpenSim", "0.5")]
46
47	namespace OpenSim.Region.OptionalModules.World.MoneyModule	44	namespace OpenSim.Region.OptionalModules.World.MoneyModule
48	{	45	{
49	/// <summary>	46	/// <summary>