aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/IRegionLoader.cs (renamed from OpenSim/Framework/IRegionLoader.cs)0
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs2
-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.xml52
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;
32using log4net; 32using log4net;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.RegionLoader.Filesystem;
36using OpenSim.Framework.RegionLoader.Web;
37using OpenSim.Region.CoreModules.Agent.AssetTransaction; 35using OpenSim.Region.CoreModules.Agent.AssetTransaction;
38using OpenSim.Region.CoreModules.Avatar.InstantMessage; 36using OpenSim.Region.CoreModules.Avatar.InstantMessage;
39using OpenSim.Region.CoreModules.Scripting.DynamicTexture; 37using 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;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using Nini.Config; 33using Nini.Config;
34using OpenSim.Framework;
34 35
35namespace OpenSim.Framework.RegionLoader.Filesystem 36namespace 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;
32using System.Xml; 32using System.Xml;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35using OpenSim.Framework;
35 36
36namespace OpenSim.Framework.RegionLoader.Web 37namespace 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>
generated by cgit v1.1 at 2024-07-16 10:20:31 +0000