diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/README (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/README) | 0 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs (renamed from OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs) | 2 |
15 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs index 9695fb8..d4acc34 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/AuraMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class AuraMetaEntity : PointMetaEntity | 55 | public class AuraMetaEntity : PointMetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs index 3b1a45e..c0a0603 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/BeamMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/BeamMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class BeamMetaEntity : PointMetaEntity | 55 | public class BeamMetaEntity : PointMetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs index 5a86d48..80989a7 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMController.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | /// <summary> | 54 | /// <summary> |
55 | /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread, | 55 | /// The controller in a Model-View-Controller framework. This controller catches actions by the avatars, creates work packets, loops through these work packets in a separate thread, |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs index cfd5cde..d5cf596 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMEntityCollection.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMEntityCollection.cs | |||
@@ -52,7 +52,7 @@ using OpenSim.Region.Physics.Manager; | |||
52 | 52 | ||
53 | using log4net; | 53 | using log4net; |
54 | 54 | ||
55 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 55 | namespace OpenSim.Region.OptionalModules.ContentManagement |
56 | { | 56 | { |
57 | public class CMEntityCollection | 57 | public class CMEntityCollection |
58 | { | 58 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs index 6399608..761dca9 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMModel.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class CMModel | 54 | public class CMModel |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs index e5c9bb3..a1a4d94 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/CMView.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/CMView.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class CMView | 54 | public class CMView |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs index 2ea5ebc..4d65038 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementEntity.cs | |||
@@ -49,7 +49,7 @@ using OpenSim.Region.Physics.Manager; | |||
49 | 49 | ||
50 | using log4net; | 50 | using log4net; |
51 | 51 | ||
52 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 52 | namespace OpenSim.Region.OptionalModules.ContentManagement |
53 | { | 53 | { |
54 | public class ContentManagementEntity : MetaEntity | 54 | public class ContentManagementEntity : MetaEntity |
55 | { | 55 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs index 417cbce..21bc8b2 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/ContentManagementModule.cs | |||
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager; | |||
48 | 48 | ||
49 | using log4net; | 49 | using log4net; |
50 | 50 | ||
51 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 51 | namespace OpenSim.Region.OptionalModules.ContentManagement |
52 | { | 52 | { |
53 | public class ContentManagementModule : IRegionModule | 53 | public class ContentManagementModule : IRegionModule |
54 | { | 54 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs index 65db153..6a50906 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/FileSystemDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/FileSystemDatabase.cs | |||
@@ -47,13 +47,13 @@ using Nini.Config; | |||
47 | using OpenSim.Framework; | 47 | using OpenSim.Framework; |
48 | using OpenSim.Region.Framework.Interfaces; | 48 | using OpenSim.Region.Framework.Interfaces; |
49 | using OpenSim.Region.Framework.Scenes; | 49 | using OpenSim.Region.Framework.Scenes; |
50 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 50 | using OpenSim.Region.CoreModules.World.Serialiser; |
51 | using OpenSim.Region.Environment.Modules.World.Terrain; | 51 | using OpenSim.Region.CoreModules.World.Terrain; |
52 | using OpenSim.Region.Physics.Manager; | 52 | using OpenSim.Region.Physics.Manager; |
53 | 53 | ||
54 | using log4net; | 54 | using log4net; |
55 | 55 | ||
56 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 56 | namespace OpenSim.Region.OptionalModules.ContentManagement |
57 | { | 57 | { |
58 | public class FileSystemDatabase : IContentDatabase | 58 | public class FileSystemDatabase : IContentDatabase |
59 | { | 59 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs index 4209dab..d24747c 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/GitDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/GitDatabase.cs | |||
@@ -48,13 +48,13 @@ using Nini.Config; | |||
48 | using OpenSim.Framework; | 48 | using OpenSim.Framework; |
49 | using OpenSim.Region.Framework.Interfaces; | 49 | using OpenSim.Region.Framework.Interfaces; |
50 | using OpenSim.Region.Framework.Scenes; | 50 | using OpenSim.Region.Framework.Scenes; |
51 | using OpenSim.Region.Environment.Modules.World.Serialiser; | 51 | using OpenSim.Region.CoreModules.World.Serialiser; |
52 | using OpenSim.Region.Environment.Modules.World.Terrain; | 52 | using OpenSim.Region.CoreModules.World.Terrain; |
53 | using OpenSim.Region.Physics.Manager; | 53 | using OpenSim.Region.Physics.Manager; |
54 | 54 | ||
55 | using log4net; | 55 | using log4net; |
56 | 56 | ||
57 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 57 | namespace OpenSim.Region.OptionalModules.ContentManagement |
58 | { | 58 | { |
59 | /// <summary> | 59 | /// <summary> |
60 | /// Just a stub :-( | 60 | /// Just a stub :-( |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs index 79dc86e..7a25fa5 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/IContentDatabase.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/IContentDatabase.cs | |||
@@ -40,7 +40,7 @@ using OpenMetaverse; | |||
40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
41 | using Nini.Config; | 41 | using Nini.Config; |
42 | 42 | ||
43 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 43 | namespace OpenSim.Region.OptionalModules.ContentManagement |
44 | { | 44 | { |
45 | public interface IContentDatabase | 45 | public interface IContentDatabase |
46 | { | 46 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs index c8f8c2f..63c74e1 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/MetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class MetaEntity | 55 | public class MetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs index d6ba92f..22f09fd 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/PointMetaEntity.cs | |||
@@ -50,7 +50,7 @@ using OpenSim.Region.Physics.Manager; | |||
50 | 50 | ||
51 | using log4net; | 51 | using log4net; |
52 | 52 | ||
53 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 53 | namespace OpenSim.Region.OptionalModules.ContentManagement |
54 | { | 54 | { |
55 | public class PointMetaEntity : MetaEntity | 55 | public class PointMetaEntity : MetaEntity |
56 | { | 56 | { |
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README b/OpenSim/Region/OptionalModules/ContentManagementSystem/README index 1a69fef..1a69fef 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/README +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/README | |||
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs index 225a682..8957e8f 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/SceneObjectGroupDiff.cs +++ b/OpenSim/Region/OptionalModules/ContentManagementSystem/SceneObjectGroupDiff.cs | |||
@@ -48,7 +48,7 @@ using OpenSim.Region.Physics.Manager; | |||
48 | 48 | ||
49 | using log4net; | 49 | using log4net; |
50 | 50 | ||
51 | namespace OpenSim.Region.Environment.Modules.ContentManagement | 51 | namespace OpenSim.Region.OptionalModules.ContentManagement |
52 | { | 52 | { |
53 | #region Enumerations | 53 | #region Enumerations |
54 | 54 | ||