diff options
| author | Melanie | 2013-03-01 23:54:00 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-01 23:54:00 +0000 |
| commit | a675f7d4c3af4550263985aafcefd11458f6d365 (patch) | |
| tree | 6966e1d313f402a1de65efee535de493d648b4aa /OpenSim/Region/OptionalModules/Example | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ... (diff) | |
| download | opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.zip opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.gz opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.bz2 opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/Example')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs index ad2fc7a..0615036 100644 --- a/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs +++ b/OpenSim/Region/OptionalModules/Example/BareBonesNonShared/BareBonesNonSharedModule.cs | |||
| @@ -33,10 +33,11 @@ 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 | // You will need to uncomment this line if you are adding a region module to some other assembly which does not already | 36 | // You will need to uncomment these lines if you are adding a region module to some other assembly which does not already |
| 37 | // specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans | 37 | // specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans |
| 38 | // the available DLLs | 38 | // the available DLLs |
| 39 | //[assembly: Addin("MyModule", "1.0")] | 39 | //[assembly: Addin("MyModule", "1.0")] |
| 40 | //[assembly: AddinDependency("OpenSim", "0.5")] | ||
| 40 | 41 | ||
| 41 | namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared | 42 | namespace OpenSim.Region.OptionalModules.Example.BareBonesNonShared |
| 42 | { | 43 | { |
diff --git a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs index bb9cbb7..811a263 100644 --- a/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs +++ b/OpenSim/Region/OptionalModules/Example/BareBonesShared/BareBonesSharedModule.cs | |||
| @@ -33,10 +33,11 @@ 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 | // You will need to uncomment this line if you are adding a region module to some other assembly which does not already | 36 | // You will need to uncomment these lines if you are adding a region module to some other assembly which does not already |
| 37 | // specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans | 37 | // specify its assembly. Otherwise, the region modules in the assembly will not be picked up when OpenSimulator scans |
| 38 | // the available DLLs | 38 | // the available DLLs |
| 39 | //[assembly: Addin("MyModule", "1.0")] | 39 | //[assembly: Addin("MyModule", "1.0")] |
| 40 | //[assembly: AddinDependency("OpenSim", "0.5")] | ||
| 40 | 41 | ||
| 41 | namespace OpenSim.Region.OptionalModules.Example.BareBonesShared | 42 | namespace OpenSim.Region.OptionalModules.Example.BareBonesShared |
| 42 | { | 43 | { |