diff options
| author | mingchen | 2007-06-28 16:17:20 +0000 |
|---|---|---|
| committer | mingchen | 2007-06-28 16:17:20 +0000 |
| commit | 108d89f89436556c8f4662197903c374db943f7d (patch) | |
| tree | 4a089c43c54bdef28c0883fd9aaef464c840c3ac /OpenSim/Grid | |
| parent | Applied ScenePresence movement patch from Darok. (diff) | |
| download | opensim-SC-108d89f89436556c8f4662197903c374db943f7d.zip opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.gz opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.bz2 opensim-SC-108d89f89436556c8f4662197903c374db943f7d.tar.xz | |
*Master User is now set up
*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml
Diffstat (limited to 'OpenSim/Grid')
4 files changed, 6 insertions, 6 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 @@ | |||
| 98 | <ItemGroup> | 98 | <ItemGroup> |
| 99 | </ItemGroup> | 99 | </ItemGroup> |
| 100 | <ItemGroup> | 100 | <ItemGroup> |
| 101 | <Compile Include="AssetHttpServer.cs"> | 101 | <Compile Include="Main.cs"> |
| 102 | <SubType>Code</SubType> | 102 | <SubType>Code</SubType> |
| 103 | </Compile> | 103 | </Compile> |
| 104 | <Compile Include="Main.cs"> | 104 | <Compile Include="AssetHttpServer.cs"> |
| 105 | <SubType>Code</SubType> | 105 | <SubType>Code</SubType> |
| 106 | </Compile> | 106 | </Compile> |
| 107 | <Compile Include="Properties\AssemblyInfo.cs"> | 107 | <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 @@ | |||
| 11 | <resources prefix="OpenSim.Grid.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" /> | ||
| 15 | <include name="Main.cs" /> | 14 | <include name="Main.cs" /> |
| 15 | <include name="AssetHttpServer.cs" /> | ||
| 16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
| 17 | </sources> | 17 | </sources> |
| 18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj index 1146b17..e822c18 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj | |||
| @@ -114,10 +114,10 @@ | |||
| 114 | </ProjectReference> | 114 | </ProjectReference> |
| 115 | </ItemGroup> | 115 | </ItemGroup> |
| 116 | <ItemGroup> | 116 | <ItemGroup> |
| 117 | <Compile Include="Main.cs"> | 117 | <Compile Include="UserManager.cs"> |
| 118 | <SubType>Code</SubType> | 118 | <SubType>Code</SubType> |
| 119 | </Compile> | 119 | </Compile> |
| 120 | <Compile Include="UserManager.cs"> | 120 | <Compile Include="Main.cs"> |
| 121 | <SubType>Code</SubType> | 121 | <SubType>Code</SubType> |
| 122 | </Compile> | 122 | </Compile> |
| 123 | <Compile Include="Properties\AssemblyInfo.cs"> | 123 | <Compile Include="Properties\AssemblyInfo.cs"> |
diff --git a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build index 50c9788..b0333f1 100644 --- a/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build +++ b/OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.exe.build | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Grid.UserServer" dynamicprefix="true" > |
| 12 | </resources> | 12 | </resources> |
| 13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
| 14 | <include name="Main.cs" /> | ||
| 15 | <include name="UserManager.cs" /> | 14 | <include name="UserManager.cs" /> |
| 15 | <include name="Main.cs" /> | ||
| 16 | <include name="Properties/AssemblyInfo.cs" /> | 16 | <include name="Properties/AssemblyInfo.cs" /> |
| 17 | </sources> | 17 | </sources> |
| 18 | <references basedir="${project::get-base-directory()}"> | 18 | <references basedir="${project::get-base-directory()}"> |