Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-04-06 09:22:55 +0100
committer: Melanie 2011-04-06 09:22:55 +0100
commit: 407c2b182303d3bc1214e71f407bddc28c671a55 (patch)
tree: e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Region/OptionalModules
parent: Merge branch 'master' into careminster-presence-refactor (diff)
parent: Change some text to make the autoreturn mechanism more obvious, and align wit... (diff)
download: opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.zip
opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz
opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2
opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
index 781fe95..dddea3e 100644
--- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
+++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
@@ -33,6 +33,9 @@ using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+[assembly: Addin("BareBonesSharedModule", "0.1")]
+[assembly: AddinDependency("OpenSim", "0.5")]
 namespace OpenSim.Region.OptionalModules.Example.BareBonesShared
 {
    /// <summary>
author	Melanie	2011-04-06 09:22:55 +0100
committer	Melanie	2011-04-06 09:22:55 +0100
commit	407c2b182303d3bc1214e71f407bddc28c671a55 (patch)
tree	e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Region/OptionalModules
parent	Merge branch 'master' into careminster-presence-refactor (diff)
parent	Change some text to make the autoreturn mechanism more obvious, and align wit... (diff)
download	opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC_OLD-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs index 781fe95..dddea3e 100644 --- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs +++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
@@ -33,6 +33,9 @@ using Nini.Config;
33	using OpenSim.Region.Framework.Interfaces;	33	using OpenSim.Region.Framework.Interfaces;
34	using OpenSim.Region.Framework.Scenes;	34	using OpenSim.Region.Framework.Scenes;
35		35
		36	[assembly: Addin("BareBonesSharedModule", "0.1")]
		37	[assembly: AddinDependency("OpenSim", "0.5")]
		38
36	namespace OpenSim.Region.OptionalModules.Example.BareBonesShared	39	namespace OpenSim.Region.OptionalModules.Example.BareBonesShared
37	{	40	{
38	/// <summary>	41	/// <summary>