diff options
author | mingchen | 2007-07-19 20:39:33 +0000 |
---|---|---|
committer | mingchen | 2007-07-19 20:39:33 +0000 |
commit | ed69e84874b710c2cc3b8af94dd00cf725cf6d03 (patch) | |
tree | 0da9c55d9a1ddc796b66ba249fa58b093294828f /OpenSim/Grid | |
parent | Some work on Inventory (not yet finished or enabled) (diff) | |
download | opensim-SC-ed69e84874b710c2cc3b8af94dd00cf725cf6d03.zip opensim-SC-ed69e84874b710c2cc3b8af94dd00cf725cf6d03.tar.gz opensim-SC-ed69e84874b710c2cc3b8af94dd00cf725cf6d03.tar.bz2 opensim-SC-ed69e84874b710c2cc3b8af94dd00cf725cf6d03.tar.xz |
*Moved XmlConfiguration to its own project
*Made it possible to load a configuration interface by DLL
*Deleted the 1024 config files until they are updated
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/AssetServer/Main.cs | 28 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/Main.cs | 4 |
3 files changed, 4 insertions, 32 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index f29a540..5a8368c 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -291,34 +291,6 @@ namespace OpenSim.Grid.AssetServer | |||
291 | //info.loaded=true; | 291 | //info.loaded=true; |
292 | } | 292 | } |
293 | 293 | ||
294 | /*private GridConfig LoadConfigDll(string dllName) | ||
295 | { | ||
296 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | ||
297 | GridConfig config = null; | ||
298 | |||
299 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
300 | { | ||
301 | if (pluginType.IsPublic) | ||
302 | { | ||
303 | if (!pluginType.IsAbstract) | ||
304 | { | ||
305 | Type typeInterface = pluginType.GetInterface("IGridConfig", true); | ||
306 | |||
307 | if (typeInterface != null) | ||
308 | { | ||
309 | IGridConfig plug = (IGridConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
310 | config = plug.GetConfigObject(); | ||
311 | break; | ||
312 | } | ||
313 | |||
314 | typeInterface = null; | ||
315 | } | ||
316 | } | ||
317 | } | ||
318 | pluginAssembly = null; | ||
319 | return config; | ||
320 | }*/ | ||
321 | |||
322 | public void CreateAsset(LLUUID assetId, byte[] assetData) | 294 | public void CreateAsset(LLUUID assetId, byte[] assetData) |
323 | { | 295 | { |
324 | AssetBase asset = new AssetBase(); | 296 | AssetBase asset = new AssetBase(); |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 94ecbfc..c72948d 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -197,7 +197,7 @@ namespace OpenSim.Grid.GridServer | |||
197 | { | 197 | { |
198 | } | 198 | } |
199 | 199 | ||
200 | private void ConfigDB(IGenericConfig configData) | 200 | /*private void ConfigDB(IGenericConfig configData) |
201 | { | 201 | { |
202 | try | 202 | try |
203 | { | 203 | { |
@@ -218,6 +218,6 @@ namespace OpenSim.Grid.GridServer | |||
218 | { | 218 | { |
219 | 219 | ||
220 | } | 220 | } |
221 | } | 221 | }*/ |
222 | } | 222 | } |
223 | } | 223 | } |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index da53e11..99401fc 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.UserServer | |||
147 | } | 147 | } |
148 | } | 148 | } |
149 | 149 | ||
150 | private void ConfigDB(IGenericConfig configData) | 150 | /*private void ConfigDB(IGenericConfig configData) |
151 | { | 151 | { |
152 | try | 152 | try |
153 | { | 153 | { |
@@ -168,7 +168,7 @@ namespace OpenSim.Grid.UserServer | |||
168 | { | 168 | { |
169 | 169 | ||
170 | } | 170 | } |
171 | } | 171 | }*/ |
172 | 172 | ||
173 | public void Show(string ShowWhat) | 173 | public void Show(string ShowWhat) |
174 | { | 174 | { |