aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/ModuleLoader.cs
diff options
context:
space:
mode:
authorMW2008-03-25 18:48:07 +0000
committerMW2008-03-25 18:48:07 +0000
commitc2ea7b99e1cdbc06035e12306a71712f763b0818 (patch)
treee25876965e745f65917e7a740b2617961ee4b325 /OpenSim/Region/Environment/ModuleLoader.cs
parent* Tear down CAPS and http handlers when an agent leaves a region (via crossin... (diff)
downloadopensim-SC-c2ea7b99e1cdbc06035e12306a71712f763b0818.zip
opensim-SC-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.gz
opensim-SC-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.bz2
opensim-SC-c2ea7b99e1cdbc06035e12306a71712f763b0818.tar.xz
Moved Avatar appearance Factory to its own project so that the reference to MySQLDatabaseMapper could be removed from Region.Environment.
Added a using OpenSim.Framework.Data statement to MySQLDatabaseMapper , to try to fix the build problem that has been reported on the mailing list.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs18
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index 4a8bf7b..7fb8d8a 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -114,15 +114,15 @@ namespace OpenSim.Region.Environment
114 m_loadedSharedModules.Add(loadMod.Name, loadMod); 114 m_loadedSharedModules.Add(loadMod.Name, loadMod);
115 } 115 }
116 116
117 AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); 117 // AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
118 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) 118 // if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
119 { 119 // {
120 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule"); 120 // m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
121 } 121 // }
122 else 122 // else
123 { 123 // {
124 m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory); 124 // m_loadedSharedModules.Add(avatarFactory.Name, avatarFactory);
125 } 125 // }
126 126
127 XMLRPCModule xmlRpcMod = new XMLRPCModule(); 127 XMLRPCModule xmlRpcMod = new XMLRPCModule();
128 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) 128 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))