* Moved LoginServer and LocalUserProfileManager to OpenSim.Servers

6 files changed, 7 insertions, 10 deletions

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index bc736b0..bd9ffb6 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -148,12 +148,6 @@
     <Compile Include="types\Triangle.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UserServer\LocalUserProfileManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="UserServer\LoginServer.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="world\Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 0cb9bf6..5e29b48 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -25,8 +25,6 @@
                 <include name="CAPS/AdminWebFront.cs" />

                 <include name="types/Mesh.cs" />

                 <include name="types/Triangle.cs" />

-                <include name="UserServer/LocalUserProfileManager.cs" />

-                <include name="UserServer/LoginServer.cs" />

                 <include name="world/Avatar.cs" />

                 <include name="world/AvatarAnimations.cs" />

                 <include name="world/Entity.cs" />

diff --git a/OpenSim/OpenSim.csproj b/OpenSim/OpenSim.csproj
index c5858c1..f56206f 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim.csproj
@@ -98,6 +98,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </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">

       <Name>OpenSim.RegionServer</Name>

       <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>

diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 613f527..deb4cfb 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -26,6 +26,7 @@
                 <include name="../bin/OpenSim.Framework.dll" />

                 <include name="../bin/OpenSim.Framework.Console.dll" />

                 <include name="../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../bin/OpenSim.Servers.dll" />

                 <include name="../bin/OpenSim.RegionServer.dll" />

             </references>

         </csc>

diff --git a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs b/Servers/LocalUserProfileManager.cs
index 6166e02..6166e02 100644
--- a/OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs
+++ b/Servers/LocalUserProfileManager.cs
diff --git a/OpenSim.RegionServer/UserServer/LoginServer.cs b/Servers/LoginServer.cs
index 4c77389..e0c090a 100644
--- a/OpenSim.RegionServer/UserServer/LoginServer.cs
+++ b/Servers/LoginServer.cs
@@ -53,10 +53,8 @@ namespace OpenSim.UserServer
     public class LoginServer : LoginService, IUserServer

     {

         private IGridServer m_gridServer;

-        private ushort _loginPort = 8080;

         public IPAddress clientAddress = IPAddress.Loopback;

         public IPAddress remoteAddress = IPAddress.Any;

-        private Socket loginServer;

         private int NumClients;

         private string _defaultResponse;

         private bool userAccounts = false;