aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
diff options
context:
space:
mode:
authorJeff Ames2008-09-09 01:26:48 +0000
committerJeff Ames2008-09-09 01:26:48 +0000
commitfae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch)
tree2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
parentFix state xxx within state xxx itself triggering a state "change" to (diff)
downloadopensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2
opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
index 85eb927..f52c3b8 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
@@ -27,7 +27,7 @@
27 27
28#region Header 28#region Header
29 29
30// ContentManagementModule.cs 30// ContentManagementModule.cs
31// User: bongiojp 31// User: bongiojp
32 32
33#endregion Header 33#endregion Header
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
98 { 98 {
99 if (source.Configs["CMS"] == null) 99 if (source.Configs["CMS"] == null)
100 return; 100 return;
101 101
102 m_enabled = source.Configs["CMS"].GetBoolean("enabled", false); 102 m_enabled = source.Configs["CMS"].GetBoolean("enabled", false);
103 databaseDir = source.Configs["CMS"].GetString("directory", databaseDir); 103 databaseDir = source.Configs["CMS"].GetString("directory", databaseDir);
104 database = source.Configs["CMS"].GetString("database", database); 104 database = source.Configs["CMS"].GetString("database", database);
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
122 return; 122 return;
123 } 123 }
124 124
125 lock(this) 125 lock (this)
126 { 126 {
127 if (!initialised) //only init once 127 if (!initialised) //only init once
128 { 128 {
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
131 m_control = new CMController(m_model, m_view, scene, channel); 131 m_control = new CMController(m_model, m_view, scene, channel);
132 m_model.Initialise(database); 132 m_model.Initialise(database);
133 m_view.Initialise(m_model); 133 m_view.Initialise(m_model);
134 134
135 initialised = true; 135 initialised = true;
136 m_model.InitialiseDatabase(scene, databaseDir); 136 m_model.InitialiseDatabase(scene, databaseDir);
137 } 137 }
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
148 if (! m_enabled) 148 if (! m_enabled)
149 return; 149 return;
150 150
151 lock(this) 151 lock (this)
152 { 152 {
153 if (!m_posted) //only post once 153 if (!m_posted) //only post once
154 { 154 {