aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/AssetServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/AssetServer/AssetHttpServer.cs (renamed from OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs)4
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs (renamed from OpenGridServices/OpenGridServices.AssetServer/Main.cs)4
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj (renamed from OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj)22
-rw-r--r--OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build (renamed from OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build)22
-rw-r--r--OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs (renamed from OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs)0
5 files changed, 26 insertions, 26 deletions
diff --git a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
index 6fc6bf8..ad8733f 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/AssetHttpServer.cs
+++ b/OpenSim/Grid/AssetServer/AssetHttpServer.cs
@@ -35,9 +35,9 @@ using System.Threading;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using System.Collections; 36using System.Collections;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38using OpenSim.Servers; 38using OpenSim.Framework.Servers;
39 39
40namespace OpenGridServices.AssetServer 40namespace OpenSim.Grid.AssetServer
41{ 41{
42 /// <summary> 42 /// <summary>
43 /// An HTTP server for sending assets 43 /// An HTTP server for sending assets
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 96c9dba..d06998d 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
40using OpenSim.Framework.Types; 40using OpenSim.Framework.Types;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Utilities; 42using OpenSim.Framework.Utilities;
43using OpenSim.Servers; 43using OpenSim.Framework.Servers;
44using Db4objects.Db4o; 44using Db4objects.Db4o;
45using Db4objects.Db4o.Query; 45using Db4objects.Db4o.Query;
46 46
47namespace OpenGridServices.AssetServer 47namespace OpenSim.Grid.AssetServer
48{ 48{
49 /// <summary> 49 /// <summary>
50 /// An asset server 50 /// An asset server
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index 7470499..caebca3 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -3,20 +3,20 @@
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{0021261B-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{E5F1A03B-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName> 10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGridServices.AssetServer</AssemblyName> 12 <AssemblyName>OpenSim.Grid.AssetServer</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript> 13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> 14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 16 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 17 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenGridServices.AssetServer</RootNamespace> 19 <RootNamespace>OpenSim.Grid.AssetServer</RootNamespace>
20 <StartupObject></StartupObject> 20 <StartupObject></StartupObject>
21 <FileUpgradeFlags> 21 <FileUpgradeFlags>
22 </FileUpgradeFlags> 22 </FileUpgradeFlags>
@@ -32,7 +32,7 @@
32 <DebugSymbols>True</DebugSymbols> 32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 34 <Optimize>False</Optimize>
35 <OutputPath>..\..\bin\</OutputPath> 35 <OutputPath>..\..\..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop> 36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -50,7 +50,7 @@
50 <DebugSymbols>False</DebugSymbols> 50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 52 <Optimize>True</Optimize>
53 <OutputPath>..\..\bin\</OutputPath> 53 <OutputPath>..\..\..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop> 54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
@@ -59,11 +59,11 @@
59 </PropertyGroup> 59 </PropertyGroup>
60 <ItemGroup> 60 <ItemGroup>
61 <Reference Include="Db4objects.Db4o.dll" > 61 <Reference Include="Db4objects.Db4o.dll" >
62 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 62 <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
63 <Private>False</Private> 63 <Private>False</Private>
64 </Reference> 64 </Reference>
65 <Reference Include="libsecondlife.dll" > 65 <Reference Include="libsecondlife.dll" >
66 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 66 <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
67 <Private>False</Private> 67 <Private>False</Private>
68 </Reference> 68 </Reference>
69 <Reference Include="OpenSim.Framework" > 69 <Reference Include="OpenSim.Framework" >
@@ -74,8 +74,8 @@
74 <HintPath>OpenSim.Framework.Console.dll</HintPath> 74 <HintPath>OpenSim.Framework.Console.dll</HintPath>
75 <Private>False</Private> 75 <Private>False</Private>
76 </Reference> 76 </Reference>
77 <Reference Include="OpenSim.Servers" > 77 <Reference Include="OpenSim.Framework.Servers" >
78 <HintPath>OpenSim.Servers.dll</HintPath> 78 <HintPath>OpenSim.Framework.Servers.dll</HintPath>
79 <Private>False</Private> 79 <Private>False</Private>
80 </Reference> 80 </Reference>
81 <Reference Include="System" > 81 <Reference Include="System" >
@@ -90,8 +90,8 @@
90 <HintPath>System.Xml.dll</HintPath> 90 <HintPath>System.Xml.dll</HintPath>
91 <Private>False</Private> 91 <Private>False</Private>
92 </Reference> 92 </Reference>
93 <Reference Include="XMLRPC" > 93 <Reference Include="XMLRPC.dll" >
94 <HintPath>XMLRPC.dll</HintPath> 94 <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
95 <Private>False</Private> 95 <Private>False</Private>
96 </Reference> 96 </Reference>
97 </ItemGroup> 97 </ItemGroup>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 385d85d..0f9540e 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -1,5 +1,5 @@
1<?xml version="1.0" ?> 1<?xml version="1.0" ?>
2<project name="OpenGridServices.AssetServer" default="build"> 2<project name="OpenSim.Grid.AssetServer" default="build">
3 <target name="build"> 3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> 4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" /> 5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
@@ -8,7 +8,7 @@
8 </fileset> 8 </fileset>
9 </copy> 9 </copy>
10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> 10 <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
11 <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" > 11 <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
12 </resources> 12 </resources>
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="AssetHttpServer.cs" /> 14 <include name="AssetHttpServer.cs" />
@@ -20,20 +20,20 @@
20 <include name="${project::get-base-directory()}" /> 20 <include name="${project::get-base-directory()}" />
21 <include name="${project::get-base-directory()}/${build.dir}" /> 21 <include name="${project::get-base-directory()}/${build.dir}" />
22 </lib> 22 </lib>
23 <include name="../../bin/Db4objects.Db4o.dll" /> 23 <include name="../../../bin/Db4objects.Db4o.dll" />
24 <include name="../../bin/libsecondlife.dll" /> 24 <include name="../../../bin/libsecondlife.dll" />
25 <include name="../../bin/OpenSim.Framework.dll" /> 25 <include name="OpenSim.Framework.dll" />
26 <include name="../../bin/OpenSim.Framework.Console.dll" /> 26 <include name="OpenSim.Framework.Console.dll" />
27 <include name="../../bin/OpenSim.Servers.dll" /> 27 <include name="OpenSim.Framework.Servers.dll" />
28 <include name="System.dll" /> 28 <include name="System.dll" />
29 <include name="System.Data.dll" /> 29 <include name="System.Data.dll" />
30 <include name="System.Xml.dll" /> 30 <include name="System.Xml.dll" />
31 <include name="../../bin/XMLRPC.dll" /> 31 <include name="../../../bin/XMLRPC.dll" />
32 </references> 32 </references>
33 </csc> 33 </csc>
34 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> 34 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../../bin/" />
35 <mkdir dir="${project::get-base-directory()}/../../bin/"/> 35 <mkdir dir="${project::get-base-directory()}/../../../bin/"/>
36 <copy todir="${project::get-base-directory()}/../../bin/"> 36 <copy todir="${project::get-base-directory()}/../../../bin/">
37 <fileset basedir="${project::get-base-directory()}/${build.dir}/" > 37 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
38 <include name="*.dll"/> 38 <include name="*.dll"/>
39 <include name="*.exe"/> 39 <include name="*.exe"/>
diff --git a/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs
index f9a18a8..f9a18a8 100644
--- a/OpenGridServices/OpenGridServices.AssetServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Grid/AssetServer/Properties/AssemblyInfo.cs