* Moved LoginServer and LocalUserProfileManager to OpenSim.Servers
parent
30c5be3704
commit
feaf036aa2
|
@ -148,12 +148,6 @@
|
||||||
<Compile Include="types\Triangle.cs">
|
<Compile Include="types\Triangle.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="UserServer\LocalUserProfileManager.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="UserServer\LoginServer.cs">
|
|
||||||
<SubType>Code</SubType>
|
|
||||||
</Compile>
|
|
||||||
<Compile Include="world\Avatar.cs">
|
<Compile Include="world\Avatar.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
<include name="CAPS/AdminWebFront.cs" />
|
<include name="CAPS/AdminWebFront.cs" />
|
||||||
<include name="types/Mesh.cs" />
|
<include name="types/Mesh.cs" />
|
||||||
<include name="types/Triangle.cs" />
|
<include name="types/Triangle.cs" />
|
||||||
<include name="UserServer/LocalUserProfileManager.cs" />
|
|
||||||
<include name="UserServer/LoginServer.cs" />
|
|
||||||
<include name="world/Avatar.cs" />
|
<include name="world/Avatar.cs" />
|
||||||
<include name="world/AvatarAnimations.cs" />
|
<include name="world/AvatarAnimations.cs" />
|
||||||
<include name="world/Entity.cs" />
|
<include name="world/Entity.cs" />
|
||||||
|
|
|
@ -98,6 +98,12 @@
|
||||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||||
<Private>False</Private>
|
<Private>False</Private>
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
|
||||||
|
<Name>OpenSim.Servers</Name>
|
||||||
|
<Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
|
||||||
|
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||||
|
<Private>False</Private>
|
||||||
|
</ProjectReference>
|
||||||
<ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
|
<ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
|
||||||
<Name>OpenSim.RegionServer</Name>
|
<Name>OpenSim.RegionServer</Name>
|
||||||
<Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
|
<Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
<include name="../bin/OpenSim.Framework.dll" />
|
<include name="../bin/OpenSim.Framework.dll" />
|
||||||
<include name="../bin/OpenSim.Framework.Console.dll" />
|
<include name="../bin/OpenSim.Framework.Console.dll" />
|
||||||
<include name="../bin/OpenSim.Physics.Manager.dll" />
|
<include name="../bin/OpenSim.Physics.Manager.dll" />
|
||||||
|
<include name="../bin/OpenSim.Servers.dll" />
|
||||||
<include name="../bin/OpenSim.RegionServer.dll" />
|
<include name="../bin/OpenSim.RegionServer.dll" />
|
||||||
</references>
|
</references>
|
||||||
</csc>
|
</csc>
|
||||||
|
|
|
@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
|
{92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|
|
@ -53,10 +53,8 @@ namespace OpenSim.UserServer
|
||||||
public class LoginServer : LoginService, IUserServer
|
public class LoginServer : LoginService, IUserServer
|
||||||
{
|
{
|
||||||
private IGridServer m_gridServer;
|
private IGridServer m_gridServer;
|
||||||
private ushort _loginPort = 8080;
|
|
||||||
public IPAddress clientAddress = IPAddress.Loopback;
|
public IPAddress clientAddress = IPAddress.Loopback;
|
||||||
public IPAddress remoteAddress = IPAddress.Any;
|
public IPAddress remoteAddress = IPAddress.Any;
|
||||||
private Socket loginServer;
|
|
||||||
private int NumClients;
|
private int NumClients;
|
||||||
private string _defaultResponse;
|
private string _defaultResponse;
|
||||||
private bool userAccounts = false;
|
private bool userAccounts = false;
|
|
@ -92,6 +92,12 @@
|
||||||
<Compile Include="IRestHandler.cs">
|
<Compile Include="IRestHandler.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="LocalUserProfileManager.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="LoginServer.cs">
|
||||||
|
<SubType>Code</SubType>
|
||||||
|
</Compile>
|
||||||
<Compile Include="XmlRpcMethod.cs">
|
<Compile Include="XmlRpcMethod.cs">
|
||||||
<SubType>Code</SubType>
|
<SubType>Code</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
|
|
@ -13,6 +13,8 @@
|
||||||
<sources failonempty="true">
|
<sources failonempty="true">
|
||||||
<include name="BaseHttpServer.cs" />
|
<include name="BaseHttpServer.cs" />
|
||||||
<include name="IRestHandler.cs" />
|
<include name="IRestHandler.cs" />
|
||||||
|
<include name="LocalUserProfileManager.cs" />
|
||||||
|
<include name="LoginServer.cs" />
|
||||||
<include name="XmlRpcMethod.cs" />
|
<include name="XmlRpcMethod.cs" />
|
||||||
</sources>
|
</sources>
|
||||||
<references basedir="${project::get-base-directory()}">
|
<references basedir="${project::get-base-directory()}">
|
||||||
|
|
|
@ -387,6 +387,7 @@
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
<Reference name="OpenSim.Framework.Console"/>
|
<Reference name="OpenSim.Framework.Console"/>
|
||||||
<Reference name="OpenSim.Physics.Manager"/>
|
<Reference name="OpenSim.Physics.Manager"/>
|
||||||
|
<Reference name="OpenSim.Servers"/>
|
||||||
<Reference name="OpenSim.RegionServer"/>
|
<Reference name="OpenSim.RegionServer"/>
|
||||||
|
|
||||||
<Files>
|
<Files>
|
||||||
|
|
Loading…
Reference in New Issue