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

author: Mic Bowman 2011-04-04 20:04:01 -0700
committer: Mic Bowman 2011-04-04 20:04:01 -0700
commit: d5e0674213dc9ca8fb038d2305e1ff5873b6363d (patch)
tree: c101a124fe3b81d4236a5f80589593d6afcb9a23 /OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
parent: Updates NullStorage plugin. (diff)
parent: Make the "All Estates" option work from the client (this makes chosen changes... (diff)
download: opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.zip
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.gz
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.bz2
opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.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	Mic Bowman	2011-04-04 20:04:01 -0700
committer	Mic Bowman	2011-04-04 20:04:01 -0700
commit	d5e0674213dc9ca8fb038d2305e1ff5873b6363d (patch)
tree	c101a124fe3b81d4236a5f80589593d6afcb9a23 /OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs
parent	Updates NullStorage plugin. (diff)
parent	Make the "All Estates" option work from the client (this makes chosen changes... (diff)
download	opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.zip opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.gz opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.tar.bz2 opensim-SC_OLD-d5e0674213dc9ca8fb038d2305e1ff5873b6363d.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>