aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj6
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build2
-rw-r--r--OpenSim/OpenSim.csproj6
-rw-r--r--OpenSim/OpenSim.exe.build1
-rw-r--r--Prebuild/Prebuild.sln26
-rw-r--r--Servers/LocalUserProfileManager.cs (renamed from OpenSim.RegionServer/UserServer/LocalUserProfileManager.cs)0
-rw-r--r--Servers/LoginServer.cs (renamed from OpenSim.RegionServer/UserServer/LoginServer.cs)2
-rw-r--r--Servers/OpenSim.Servers.csproj6
-rw-r--r--Servers/OpenSim.Servers.dll.build2
-rw-r--r--prebuild.xml1
10 files changed, 29 insertions, 23 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 @@
148 <Compile Include="types\Triangle.cs"> 148 <Compile Include="types\Triangle.cs">
149 <SubType>Code</SubType> 149 <SubType>Code</SubType>
150 </Compile> 150 </Compile>
151 <Compile Include="UserServer\LocalUserProfileManager.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="UserServer\LoginServer.cs">
155 <SubType>Code</SubType>
156 </Compile>
157 <Compile Include="world\Avatar.cs"> 151 <Compile Include="world\Avatar.cs">
158 <SubType>Code</SubType> 152 <SubType>Code</SubType>
159 </Compile> 153 </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 @@
25 <include name="CAPS/AdminWebFront.cs" /> 25 <include name="CAPS/AdminWebFront.cs" />
26 <include name="types/Mesh.cs" /> 26 <include name="types/Mesh.cs" />
27 <include name="types/Triangle.cs" /> 27 <include name="types/Triangle.cs" />
28 <include name="UserServer/LocalUserProfileManager.cs" />
29 <include name="UserServer/LoginServer.cs" />
30 <include name="world/Avatar.cs" /> 28 <include name="world/Avatar.cs" />
31 <include name="world/AvatarAnimations.cs" /> 29 <include name="world/AvatarAnimations.cs" />
32 <include name="world/Entity.cs" /> 30 <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 @@
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 99 <Private>False</Private>
100 </ProjectReference> 100 </ProjectReference>
101 <ProjectReference Include="..\Servers\OpenSim.Servers.csproj">
102 <Name>OpenSim.Servers</Name>
103 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private>
106 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 107 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
102 <Name>OpenSim.RegionServer</Name> 108 <Name>OpenSim.RegionServer</Name>
103 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> 109 <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 @@
26 <include name="../bin/OpenSim.Framework.dll" /> 26 <include name="../bin/OpenSim.Framework.dll" />
27 <include name="../bin/OpenSim.Framework.Console.dll" /> 27 <include name="../bin/OpenSim.Framework.Console.dll" />
28 <include name="../bin/OpenSim.Physics.Manager.dll" /> 28 <include name="../bin/OpenSim.Physics.Manager.dll" />
29 <include name="../bin/OpenSim.Servers.dll" />
29 <include name="../bin/OpenSim.RegionServer.dll" /> 30 <include name="../bin/OpenSim.RegionServer.dll" />
30 </references> 31 </references>
31 </csc> 32 </csc>
diff --git a/Prebuild/Prebuild.sln b/Prebuild/Prebuild.sln
index 227677f..449896b 100644
--- a/Prebuild/Prebuild.sln
+++ b/Prebuild/Prebuild.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 9.00
3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}" 3Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prebuild", "src\Prebuild.csproj", "{92E80C1C-0000-0000-0000-000000000000}"
4EndProject 4EndProject
5Global 5Global
6 GlobalSection(SolutionConfigurationPlatforms) = preSolution 6 GlobalSection(SolutionConfigurationPlatforms) = preSolution
7 Debug|Any CPU = Debug|Any CPU 7 Debug|Any CPU = Debug|Any CPU
8 Release|Any CPU = Release|Any CPU 8 Release|Any CPU = Release|Any CPU
9 EndGlobalSection 9 EndGlobalSection
10 GlobalSection(ProjectConfigurationPlatforms) = postSolution 10 GlobalSection(ProjectConfigurationPlatforms) = postSolution
11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 11 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
12 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU 12 {92E80C1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
13 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU 13 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
14 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU 14 {92E80C1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
15 EndGlobalSection 15 EndGlobalSection
16 GlobalSection(SolutionProperties) = preSolution 16 GlobalSection(SolutionProperties) = preSolution
17 HideSolutionNode = FALSE 17 HideSolutionNode = FALSE
18 EndGlobalSection 18 EndGlobalSection
19EndGlobal 19EndGlobal
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
53 public class LoginServer : LoginService, IUserServer 53 public class LoginServer : LoginService, IUserServer
54 { 54 {
55 private IGridServer m_gridServer; 55 private IGridServer m_gridServer;
56 private ushort _loginPort = 8080;
57 public IPAddress clientAddress = IPAddress.Loopback; 56 public IPAddress clientAddress = IPAddress.Loopback;
58 public IPAddress remoteAddress = IPAddress.Any; 57 public IPAddress remoteAddress = IPAddress.Any;
59 private Socket loginServer;
60 private int NumClients; 58 private int NumClients;
61 private string _defaultResponse; 59 private string _defaultResponse;
62 private bool userAccounts = false; 60 private bool userAccounts = false;
diff --git a/Servers/OpenSim.Servers.csproj b/Servers/OpenSim.Servers.csproj
index d85c029..bff2454 100644
--- a/Servers/OpenSim.Servers.csproj
+++ b/Servers/OpenSim.Servers.csproj
@@ -92,6 +92,12 @@
92 <Compile Include="IRestHandler.cs"> 92 <Compile Include="IRestHandler.cs">
93 <SubType>Code</SubType> 93 <SubType>Code</SubType>
94 </Compile> 94 </Compile>
95 <Compile Include="LocalUserProfileManager.cs">
96 <SubType>Code</SubType>
97 </Compile>
98 <Compile Include="LoginServer.cs">
99 <SubType>Code</SubType>
100 </Compile>
95 <Compile Include="XmlRpcMethod.cs"> 101 <Compile Include="XmlRpcMethod.cs">
96 <SubType>Code</SubType> 102 <SubType>Code</SubType>
97 </Compile> 103 </Compile>
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 48e8dec..4bf9d18 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -13,6 +13,8 @@
13 <sources failonempty="true"> 13 <sources failonempty="true">
14 <include name="BaseHttpServer.cs" /> 14 <include name="BaseHttpServer.cs" />
15 <include name="IRestHandler.cs" /> 15 <include name="IRestHandler.cs" />
16 <include name="LocalUserProfileManager.cs" />
17 <include name="LoginServer.cs" />
16 <include name="XmlRpcMethod.cs" /> 18 <include name="XmlRpcMethod.cs" />
17 </sources> 19 </sources>
18 <references basedir="${project::get-base-directory()}"> 20 <references basedir="${project::get-base-directory()}">
diff --git a/prebuild.xml b/prebuild.xml
index 3c84703..8cf0fcc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -387,6 +387,7 @@
387 <Reference name="OpenSim.Framework"/> 387 <Reference name="OpenSim.Framework"/>
388 <Reference name="OpenSim.Framework.Console"/> 388 <Reference name="OpenSim.Framework.Console"/>
389 <Reference name="OpenSim.Physics.Manager"/> 389 <Reference name="OpenSim.Physics.Manager"/>
390 <Reference name="OpenSim.Servers"/>
390 <Reference name="OpenSim.RegionServer"/> 391 <Reference name="OpenSim.RegionServer"/>
391 392
392 <Files> 393 <Files>