*Master User is now set up

*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
index caebca3..945b7a5 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.csproj
@@ -98,10 +98,10 @@
   <ItemGroup>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="AssetHttpServer.cs">

+    <Compile Include="Main.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Main.cs">

+    <Compile Include="AssetHttpServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
index 88724f6..0a1b533 100644
--- a/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
+++ b/OpenSim/Grid/AssetServer/OpenSim.Grid.AssetServer.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="AssetHttpServer.cs" />

                 <include name="Main.cs" />

+                <include name="AssetHttpServer.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">