diff options
author | Diva Canto | 2015-09-05 17:37:07 -0700 |
---|---|---|
committer | Diva Canto | 2015-09-05 17:37:07 -0700 |
commit | 3cf07564b6d4e72f6193f5affdcb0dc14624991a (patch) | |
tree | 26ce3f3327e27a454df0f4fa501d14e3aac957f9 | |
parent | Deleted unused file. (diff) | |
download | opensim-SC_OLD-3cf07564b6d4e72f6193f5affdcb0dc14624991a.zip opensim-SC_OLD-3cf07564b6d4e72f6193f5affdcb0dc14624991a.tar.gz opensim-SC_OLD-3cf07564b6d4e72f6193f5affdcb0dc14624991a.tar.bz2 opensim-SC_OLD-3cf07564b6d4e72f6193f5affdcb0dc14624991a.tar.xz |
Moved the two region loaders into the RegionLoaderPlugin dll, therefore eliminating 2 top-level dlls that didn't make much sense.
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs (renamed from OpenSim/Framework/IRegionLoader.cs) | 0 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 2 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs (renamed from OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs) | 3 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs (renamed from OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs) | 3 | ||||
-rw-r--r-- | prebuild.xml | 52 |
5 files changed, 4 insertions, 56 deletions
diff --git a/OpenSim/Framework/IRegionLoader.cs b/OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs index c566fc7..c566fc7 100644 --- a/OpenSim/Framework/IRegionLoader.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs | |||
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 74d9ae4..89224a6 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | |||
@@ -32,8 +32,6 @@ using System.Threading; | |||
32 | using log4net; | 32 | using log4net; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.RegionLoader.Filesystem; | ||
36 | using OpenSim.Framework.RegionLoader.Web; | ||
37 | using OpenSim.Region.CoreModules.Agent.AssetTransaction; | 35 | using OpenSim.Region.CoreModules.Agent.AssetTransaction; |
38 | using OpenSim.Region.CoreModules.Avatar.InstantMessage; | 36 | using OpenSim.Region.CoreModules.Avatar.InstantMessage; |
39 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; | 37 | using OpenSim.Region.CoreModules.Scripting.DynamicTexture; |
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs index 8332c14..1873a06 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderFileSystem.cs | |||
@@ -31,8 +31,9 @@ using System.Collections.Generic; | |||
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using OpenSim.Framework; | ||
34 | 35 | ||
35 | namespace OpenSim.Framework.RegionLoader.Filesystem | 36 | namespace OpenSim.ApplicationPlugins.LoadRegions |
36 | { | 37 | { |
37 | public class RegionLoaderFileSystem : IRegionLoader | 38 | public class RegionLoaderFileSystem : IRegionLoader |
38 | { | 39 | { |
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs index f60bb12..850f3e0 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/RegionLoaderWebServer.cs | |||
@@ -32,8 +32,9 @@ using System.Reflection; | |||
32 | using System.Xml; | 32 | using System.Xml; |
33 | using log4net; | 33 | using log4net; |
34 | using Nini.Config; | 34 | using Nini.Config; |
35 | using OpenSim.Framework; | ||
35 | 36 | ||
36 | namespace OpenSim.Framework.RegionLoader.Web | 37 | namespace OpenSim.ApplicationPlugins.LoadRegions |
37 | { | 38 | { |
38 | public class RegionLoaderWebServer : IRegionLoader | 39 | public class RegionLoaderWebServer : IRegionLoader |
39 | { | 40 | { |
diff --git a/prebuild.xml b/prebuild.xml index 0daf6a4..7b17001 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -325,58 +325,6 @@ | |||
325 | </Files> | 325 | </Files> |
326 | </Project> | 326 | </Project> |
327 | 327 | ||
328 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Web" path="OpenSim/Framework/RegionLoader/Web" type="Library"> | ||
329 | <Configuration name="Debug"> | ||
330 | <Options> | ||
331 | <OutputPath>../../../../bin/</OutputPath> | ||
332 | </Options> | ||
333 | </Configuration> | ||
334 | <Configuration name="Release"> | ||
335 | <Options> | ||
336 | <OutputPath>../../../../bin/</OutputPath> | ||
337 | </Options> | ||
338 | </Configuration> | ||
339 | |||
340 | <ReferencePath>../../../../bin/</ReferencePath> | ||
341 | <Reference name="System"/> | ||
342 | <Reference name="System.Xml"/> | ||
343 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
344 | <Reference name="XMLRPC" path="../../../../bin/"/> | ||
345 | <Reference name="OpenSim.Framework"/> | ||
346 | <Reference name="OpenSim.Framework.Console"/> | ||
347 | <Reference name="Nini" path="../../../../bin/"/> | ||
348 | <Reference name="log4net" path="../../../../bin/"/> | ||
349 | <Files> | ||
350 | <Match pattern="*.cs" recurse="true"/> | ||
351 | </Files> | ||
352 | </Project> | ||
353 | |||
354 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.RegionLoader.Filesystem" path="OpenSim/Framework/RegionLoader/Filesystem" type="Library"> | ||
355 | <Configuration name="Debug"> | ||
356 | <Options> | ||
357 | <OutputPath>../../../../bin/</OutputPath> | ||
358 | </Options> | ||
359 | </Configuration> | ||
360 | <Configuration name="Release"> | ||
361 | <Options> | ||
362 | <OutputPath>../../../../bin/</OutputPath> | ||
363 | </Options> | ||
364 | </Configuration> | ||
365 | |||
366 | <ReferencePath>../../../../bin/</ReferencePath> | ||
367 | <Reference name="System"/> | ||
368 | <Reference name="System.Xml"/> | ||
369 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
370 | <Reference name="log4net" path="../../../../bin/"/> | ||
371 | <Reference name="XMLRPC" path="../../../../bin/"/> | ||
372 | <Reference name="OpenSim.Framework"/> | ||
373 | <Reference name="OpenSim.Framework.Console"/> | ||
374 | <Reference name="Nini" path="../../../../bin/"/> | ||
375 | <Files> | ||
376 | <Match pattern="*.cs" recurse="true"/> | ||
377 | </Files> | ||
378 | </Project> | ||
379 | |||
380 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library"> | 328 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers" path="OpenSim/Framework/Servers" type="Library"> |
381 | <Configuration name="Debug"> | 329 | <Configuration name="Debug"> |
382 | <Options> | 330 | <Options> |