aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs5
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs77
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs53
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj46
-rw-r--r--Common/OpenSim.Framework/LLSDHelpers.cs51
-rw-r--r--Common/OpenSim.Framework/OpenSim.Framework.csproj10
-rw-r--r--Common/OpenSim.Framework/Types/NetworkServersInfo.cs14
-rw-r--r--Common/OpenSim.Servers/OpenSim.Servers.csproj46
-rw-r--r--OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs110
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs7
-rw-r--r--OpenSim/OpenSim.Region/Caps.cs1
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs1
-rw-r--r--OpenSim/OpenSim/Application.cs1
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs13
-rw-r--r--prebuild.xml1
17 files changed, 300 insertions, 142 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
index 308e00f..563eaf7 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
@@ -7,10 +7,11 @@ namespace OpenGrid.Framework.Communications.OGS1
7{ 7{
8 public class GridCommsManager : CommunicationsManager 8 public class GridCommsManager : CommunicationsManager
9 { 9 {
10 private OGS1GridServices gridInterComms = new OGS1GridServices();
10 public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo) 11 public GridCommsManager(NetworkServersInfo serversInfo) :base(serversInfo)
11 { 12 {
12 GridServer = new OGS1GridServices(); 13 GridServer = gridInterComms;
13 InterRegion = new OGSInterSimComms(); 14 InterRegion = gridInterComms;
14 UserServer = new OGSUserServices(); 15 UserServer = new OGSUserServices();
15 } 16 }
16 } 17 }
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
index a67f55d..db64f0c 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGS1GridServices.cs
@@ -2,9 +2,11 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Collections; 3using System.Collections;
4using System.Text; 4using System.Text;
5using System.Runtime.Remoting;
6using System.Runtime.Remoting.Channels;
7using System.Runtime.Remoting.Channels.Tcp;
5 8
6using OpenSim.Servers; 9using OpenSim.Servers;
7
8using OpenSim.Framework; 10using OpenSim.Framework;
9using OpenSim.Framework.Types; 11using OpenSim.Framework.Types;
10using OpenGrid.Framework.Communications; 12using OpenGrid.Framework.Communications;
@@ -14,7 +16,7 @@ using libsecondlife;
14 16
15namespace OpenGrid.Framework.Communications.OGS1 17namespace OpenGrid.Framework.Communications.OGS1
16{ 18{
17 public class OGS1GridServices : IGridServices 19 public class OGS1GridServices : IGridServices, IInterRegionCommunications
18 { 20 {
19 public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>(); 21 public Dictionary<ulong, RegionCommsListener> listeners = new Dictionary<ulong, RegionCommsListener>();
20 public GridInfo grid; 22 public GridInfo grid;
@@ -49,19 +51,19 @@ namespace OpenGrid.Framework.Communications.OGS1
49 string errorstring = (string)GridRespData["error"]; 51 string errorstring = (string)GridRespData["error"];
50 OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring); 52 OpenSim.Framework.Console.MainLog.Instance.Error("Unable to connect to grid: " + errorstring);
51 return null; 53 return null;
52 } 54 }
53
54 // Initialise the background listeners
55 listeners[regionInfo.RegionHandle] = new RegionCommsListener();
56 55
57 if (!initialised) 56 if (!this.listeners.ContainsKey(regionInfo.RegionHandle))
58 { 57 {
59 initialised = true; 58 // initialised = true;
60 httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort); 59 httpListener = new BaseHttpServer(regionInfo.CommsIPListenPort);
61 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser); 60 httpListener.AddXmlRPCHandler("expect_user", this.ExpectUser);
62 httpListener.Start(); 61 httpListener.Start();
63 } 62 }
64 63
64 // Initialise the background listeners
65 listeners[regionInfo.RegionHandle] = new RegionCommsListener();
66
65 return listeners[regionInfo.RegionHandle]; 67 return listeners[regionInfo.RegionHandle];
66 } 68 }
67 69
@@ -182,6 +184,65 @@ namespace OpenGrid.Framework.Communications.OGS1
182 return new XmlRpcResponse(); 184 return new XmlRpcResponse();
183 } 185 }
184 186
187 #region InterRegion Comms
188 private void StartRemoting()
189 {
190 TcpChannel ch = new TcpChannel(8895);
191 ChannelServices.RegisterChannel(ch);
192
193 WellKnownServiceTypeEntry wellType = new WellKnownServiceTypeEntry( Type.GetType("OGS1InterRegionRemoting"), "InterRegions", WellKnownObjectMode.Singleton);
194 RemotingConfiguration.RegisterWellKnownServiceType(wellType);
195 InterRegionSingleton.Instance.OnArrival += this.IncomingArrival;
196 InterRegionSingleton.Instance.OnChildAgent += this.IncomingChildAgent;
197 }
198
199 #region Methods called by regions in this instance
200 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
201 {
202 if (this.listeners.ContainsKey(regionHandle))
203 {
204 this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
205 return true;
206 }
207 //TODO need to see if we know about where this region is and use .net remoting
208 // to inform it.
209 return false;
210 }
185 211
212 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
213 {
214 if (this.listeners.ContainsKey(regionHandle))
215 {
216 this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
217 return true;
218 }
219 //TODO need to see if we know about where this region is and use .net remoting
220 // to inform it.
221 return false;
222 }
223 #endregion
224
225 #region Methods triggered by calls from external instances
226 public bool IncomingChildAgent(ulong regionHandle, AgentCircuitData agentData)
227 {
228 if (this.listeners.ContainsKey(regionHandle))
229 {
230 this.listeners[regionHandle].TriggerExpectUser(regionHandle, agentData);
231 return true;
232 }
233 return false;
234 }
235
236 public bool IncomingArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
237 {
238 if (this.listeners.ContainsKey(regionHandle))
239 {
240 this.listeners[regionHandle].TriggerExpectAvatarCrossing(regionHandle, agentID, position);
241 return true;
242 }
243 return false;
244 }
245 #endregion
246 #endregion
186 } 247 }
187} 248}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
index 0024d14..3d74e2f 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
@@ -5,15 +5,66 @@ using OpenSim.Framework.Types;
5using OpenGrid.Framework.Communications; 5using OpenGrid.Framework.Communications;
6namespace OpenGrid.Framework.Communications.OGS1 6namespace OpenGrid.Framework.Communications.OGS1
7{ 7{
8 public class OGSInterSimComms : IInterRegionCommunications 8 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
9 public delegate bool ExpectArrival(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position);
10
11 public sealed class InterRegionSingleton
9 { 12 {
13 static readonly InterRegionSingleton instance = new InterRegionSingleton();
14
15 public event InformRegionChild OnChildAgent;
16 public event ExpectArrival OnArrival;
17
18 static InterRegionSingleton()
19 {
20 }
21
22 InterRegionSingleton()
23 {
24 }
25
26 public static InterRegionSingleton Instance
27 {
28 get
29 {
30 return instance;
31 }
32 }
33
10 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData) 34 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
11 { 35 {
36 if (OnChildAgent != null)
37 {
38 return OnChildAgent(regionHandle, agentData);
39 }
12 return false; 40 return false;
13 } 41 }
42
14 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position) 43 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
15 { 44 {
45 if (OnArrival != null)
46 {
47 return OnArrival(regionHandle, agentID, position);
48 }
16 return false; 49 return false;
17 } 50 }
18 } 51 }
52
53 public class OGS1InterRegionRemoting : MarshalByRefObject
54 {
55
56 public OGS1InterRegionRemoting()
57 {
58 }
59
60 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
61 {
62 return InterRegionSingleton.Instance.InformRegionOfChildAgent(regionHandle, agentData);
63 }
64
65 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
66 {
67 return InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, agentID, position);
68 }
69 }
19} 70}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
index 3f4f22d..00246e1 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName> 13 <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace> 21 <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,22 +61,24 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Data" > 76 <Reference Include="System.Data">
70 <HintPath>System.Data.dll</HintPath> 77 <HintPath>System.Data.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System.Xml" > 80 <Reference Include="System.Runtime.Remoting" />
81 <Reference Include="System.Xml">
74 <HintPath>System.Xml.dll</HintPath> 82 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 83 <Private>False</Private>
76 </Reference> 84 </Reference>
@@ -80,37 +88,37 @@
80 <Name>OpenGrid.Framework.Communications</Name> 88 <Name>OpenGrid.Framework.Communications</Name>
81 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 89 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 91 <Private>False</Private>
84 </ProjectReference> 92 </ProjectReference>
85 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj"> 93 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
86 <Name>OpenGrid.Framework.Data</Name> 94 <Name>OpenGrid.Framework.Data</Name>
87 <Project>{62CDF671-0000-0000-0000-000000000000}</Project> 95 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 96 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 97 <Private>False</Private>
90 </ProjectReference> 98 </ProjectReference>
91 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 99 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
92 <Name>OpenSim.Framework</Name> 100 <Name>OpenSim.Framework</Name>
93 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 101 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 102 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
95 <Private>False</Private> 103 <Private>False</Private>
96 </ProjectReference> 104 </ProjectReference>
97 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 105 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
98 <Name>OpenSim.Framework.Console</Name> 106 <Name>OpenSim.Framework.Console</Name>
99 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 107 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 108 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
101 <Private>False</Private> 109 <Private>False</Private>
102 </ProjectReference> 110 </ProjectReference>
103 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> 111 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
104 <Name>OpenSim.Servers</Name> 112 <Name>OpenSim.Servers</Name>
105 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 113 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 114 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private> 115 <Private>False</Private>
108 </ProjectReference> 116 </ProjectReference>
109 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 117 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
110 <Name>XMLRPC</Name> 118 <Name>XMLRPC</Name>
111 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 119 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
112 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 120 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
113 <Private>False</Private> 121 <Private>False</Private>
114 </ProjectReference> 122 </ProjectReference>
115 </ItemGroup> 123 </ItemGroup>
116 <ItemGroup> 124 <ItemGroup>
@@ -137,4 +145,4 @@
137 <PostBuildEvent> 145 <PostBuildEvent>
138 </PostBuildEvent> 146 </PostBuildEvent>
139 </PropertyGroup> 147 </PropertyGroup>
140</Project> 148</Project> \ No newline at end of file
diff --git a/Common/OpenSim.Framework/LLSDHelpers.cs b/Common/OpenSim.Framework/LLSDHelpers.cs
index 3b044a3..051520c 100644
--- a/Common/OpenSim.Framework/LLSDHelpers.cs
+++ b/Common/OpenSim.Framework/LLSDHelpers.cs
@@ -89,7 +89,23 @@ namespace OpenSim.Framework
89 System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key); 89 System.Reflection.FieldInfo field = myType.GetField((string)enumerator.Key);
90 if (field != null) 90 if (field != null)
91 { 91 {
92 field.SetValue(obj, enumerator.Value); 92 if (enumerator.Value is Hashtable)
93 {
94 object fieldValue = field.GetValue(obj);
95 DeserialiseLLSDMap((Hashtable) enumerator.Value, fieldValue);
96 }
97 else if (enumerator.Value is ArrayList)
98 {
99 object fieldValue = field.GetValue(obj);
100 fieldValue.GetType().GetField("Array").SetValue(fieldValue, enumerator.Value);
101 //TODO
102 // the LLSD map/array types in the array need to be deserialised
103 // but first we need to know the right class to deserialise them into.
104 }
105 else
106 {
107 field.SetValue(obj, enumerator.Value);
108 }
93 } 109 }
94 } 110 }
95 break; 111 break;
@@ -161,6 +177,39 @@ namespace OpenSim.Framework
161 } 177 }
162 } 178 }
163 179
180 [LLSDType("MAP")]
181 public class LLSDUploadReply
182 {
183 public string new_asset = "";
184 public LLUUID new_inventory_item = LLUUID.Zero;
185 public string state = "";
186
187 public LLSDUploadReply()
188 {
189
190 }
191 }
192
193 [LLSDType("MAP")]
194 public class LLSDCapEvent
195 {
196 public int id = 0;
197 public LLSDArray events = new LLSDArray();
198
199 public LLSDCapEvent()
200 {
201
202 }
203 }
204
205 [LLSDType("MAP")]
206 public class LLSDEmpty
207 {
208 public LLSDEmpty()
209 {
210
211 }
212 }
164 213
165 [LLSDType("MAP")] 214 [LLSDType("MAP")]
166 public class LLSDTest 215 public class LLSDTest
diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj
index f12ffcb..ac0b195 100644
--- a/Common/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj
@@ -126,15 +126,7 @@
126 <Compile Include="SimProfile.cs"> 126 <Compile Include="SimProfile.cs">
127 <SubType>Code</SubType> 127 <SubType>Code</SubType>
128 </Compile> 128 </Compile>
129 <Compile Include="UserProfile.cs"> 129 <Compile Include="UserProfile.cs" />
130 <SubType>Code</SubType>
131 </Compile>
132 <Compile Include="UserProfileManager.cs">
133 <SubType>Code</SubType>
134 </Compile>
135 <Compile Include="UserProfileManagerBase.cs">
136 <SubType>Code</SubType>
137 </Compile>
138 <Compile Include="Util.cs"> 130 <Compile Include="Util.cs">
139 <SubType>Code</SubType> 131 <SubType>Code</SubType>
140 </Compile> 132 </Compile>
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 9c2e7a6..73d7811 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.Types
49 public uint DefaultHomeLocY = 0; 49 public uint DefaultHomeLocY = 0;
50 50
51 public int HttpListenerPort = 9000; 51 public int HttpListenerPort = 9000;
52 public int RemotingListenerPort = 8895;
52 53
53 public void InitConfig(bool sandboxMode, IGenericConfig configData) 54 public void InitConfig(bool sandboxMode, IGenericConfig configData)
54 { 55 {
@@ -71,6 +72,19 @@ namespace OpenSim.Framework.Types
71 this.HttpListenerPort = Convert.ToInt32(attri); 72 this.HttpListenerPort = Convert.ToInt32(attri);
72 } 73 }
73 74
75 attri = "";
76 attri = configData.GetAttribute("RemotingListenerPort");
77 if (attri == "")
78 {
79 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Remoting Listener Port", "8895");
80 configData.SetAttribute("RemotingListenerPort", location);
81 this.RemotingListenerPort = Convert.ToInt32(location);
82 }
83 else
84 {
85 this.RemotingListenerPort = Convert.ToInt32(attri);
86 }
87
74 if (sandboxMode) 88 if (sandboxMode)
75 { 89 {
76 // default home location X 90 // default home location X
diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj
index e9be796..6e8eba7 100644
--- a/Common/OpenSim.Servers/OpenSim.Servers.csproj
+++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8BB20F0A-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Servers</AssemblyName> 13 <AssemblyName>OpenSim.Servers</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Servers</RootNamespace> 21 <RootNamespace>OpenSim.Servers</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,18 +61,19 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="libsecondlife.dll" > 68 <Reference Include="libsecondlife.dll">
62 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 69 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System" > 72 <Reference Include="System">
66 <HintPath>System.dll</HintPath> 73 <HintPath>System.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="System.Xml" > 76 <Reference Include="System.Xml">
70 <HintPath>System.Xml.dll</HintPath> 77 <HintPath>System.Xml.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
@@ -76,19 +83,19 @@
76 <Name>OpenSim.Framework</Name> 83 <Name>OpenSim.Framework</Name>
77 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 84 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
78 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 85 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
79 <Private>False</Private> 86 <Private>False</Private>
80 </ProjectReference> 87 </ProjectReference>
81 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 88 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
82 <Name>OpenSim.Framework.Console</Name> 89 <Name>OpenSim.Framework.Console</Name>
83 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 90 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
84 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 91 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
85 <Private>False</Private> 92 <Private>False</Private>
86 </ProjectReference> 93 </ProjectReference>
87 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 94 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
88 <Name>XMLRPC</Name> 95 <Name>XMLRPC</Name>
89 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 96 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
91 <Private>False</Private> 98 <Private>False</Private>
92 </ProjectReference> 99 </ProjectReference>
93 </ItemGroup> 100 </ItemGroup>
94 <ItemGroup> 101 <ItemGroup>
@@ -101,15 +108,6 @@
101 <Compile Include="IRestHandler.cs"> 108 <Compile Include="IRestHandler.cs">
102 <SubType>Code</SubType> 109 <SubType>Code</SubType>
103 </Compile> 110 </Compile>
104 <Compile Include="LocalUserProfileManager.cs">
105 <SubType>Code</SubType>
106 </Compile>
107 <Compile Include="LoginResponse.cs">
108 <SubType>Code</SubType>
109 </Compile>
110 <Compile Include="LoginServer.cs">
111 <SubType>Code</SubType>
112 </Compile>
113 <Compile Include="UDPServerBase.cs"> 111 <Compile Include="UDPServerBase.cs">
114 <SubType>Code</SubType> 112 <SubType>Code</SubType>
115 </Compile> 113 </Compile>
@@ -124,4 +122,4 @@
124 <PostBuildEvent> 122 <PostBuildEvent>
125 </PostBuildEvent> 123 </PostBuildEvent>
126 </PropertyGroup> 124 </PropertyGroup>
127</Project> 125</Project> \ No newline at end of file
diff --git a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
index d665ab4..e276556 100644
--- a/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
+++ b/OpenGridServices/OpenGrid.Framework.Manager/GridServerManager.cs
@@ -24,71 +24,71 @@
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections; 30using System.Collections;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using Nwc.XmlRpc; 32using Nwc.XmlRpc;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35 35
36namespace OpenGrid.Framework.Manager { 36namespace OpenGrid.Framework.Manager {
37 37
38 /// <summary> 38 /// <summary>
39 /// A remote management system for the grid server 39 /// A remote management system for the grid server
40 /// </summary> 40 /// </summary>
41 public class GridServerManager 41 public class GridServerManager
42 { 42 {
43 /// <summary> 43 /// <summary>
44 /// Triggers events from the grid manager 44 /// Triggers events from the grid manager
45 /// </summary> 45 /// </summary>
46 public static GridManagerCallback thecallback; 46 public static GridManagerCallback thecallback;
47 47
48 /// <summary> 48 /// <summary>
49 /// Security keys 49 /// Security keys
50 /// </summary> 50 /// </summary>
51 public static string sendkey; 51 public static string sendkey;
52 public static string recvkey; 52 public static string recvkey;
53 53
54 /// <summary> 54 /// <summary>
55 /// Disconnects the grid server and shuts it down 55 /// Disconnects the grid server and shuts it down
56 /// </summary> 56 /// </summary>
57 /// <param name="request">XmlRpc Request</param> 57 /// <param name="request">XmlRpc Request</param>
58 /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns> 58 /// <returns>An XmlRpc response containing either a "msg" or an "error"</returns>
59 public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) 59 public static XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
60 { 60 {
61 XmlRpcResponse response = new XmlRpcResponse(); 61 XmlRpcResponse response = new XmlRpcResponse();
62 Hashtable requestData = (Hashtable)request.Params[0]; 62 Hashtable requestData = (Hashtable)request.Params[0];
63 Hashtable responseData = new Hashtable(); 63 Hashtable responseData = new Hashtable();
64 64
65 if(requestData.ContainsKey("session_id")) { 65 if(requestData.ContainsKey("session_id")) {
66 if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) { 66 if(GridManagementAgent.SessionExists(new LLUUID((string)requestData["session_id"]))) {
67 responseData["msg"]="Shutdown command accepted"; 67 responseData["msg"]="Shutdown command accepted";
68 (new Thread(new ThreadStart(ShutdownServer))).Start(); 68 (new Thread(new ThreadStart(ShutdownServer))).Start();
69 } else { 69 } else {
70 response.IsFault=true; 70 response.IsFault=true;
71 responseData["error"]="bad session ID"; 71 responseData["error"]="bad session ID";
72 } 72 }
73 } else { 73 } else {
74 response.IsFault=true; 74 response.IsFault=true;
75 responseData["error"]="no session ID"; 75 responseData["error"]="no session ID";
76 } 76 }
77 77
78 response.Value = responseData; 78 response.Value = responseData;
79 return response; 79 return response;
80 } 80 }
81 81
82 /// <summary> 82 /// <summary>
83 /// Shuts down the grid server 83 /// Shuts down the grid server
84 /// </summary> 84 /// </summary>
85 public static void ShutdownServer() 85 public static void ShutdownServer()
86 { 86 {
87 Console.WriteLine("Shutting down the grid server - recieved a grid manager request"); 87 Console.WriteLine("Shutting down the grid server - recieved a grid manager request");
88 Console.WriteLine("Terminating in three seconds..."); 88 Console.WriteLine("Terminating in three seconds...");
89 Thread.Sleep(3000); 89 Thread.Sleep(3000);
90 thecallback("shutdown"); 90 thecallback("shutdown");
91 } 91 }
92 } 92 }
93} 93}
94 94
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 378a09c..e1465d1 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -8,7 +8,6 @@ using OpenSim.Framework.Types;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
9using OpenSim.Assets; 9using OpenSim.Assets;
10using libsecondlife; 10using libsecondlife;
11using OpenSim.UserServer;
12using OpenSim.Servers; 11using OpenSim.Servers;
13using OpenSim.Framework; 12using OpenSim.Framework;
14using OpenSim.Caches; 13using OpenSim.Caches;
@@ -32,10 +31,10 @@ namespace SimpleApp
32 31
33 string simAddr = "127.0.0.1"; 32 string simAddr = "127.0.0.1";
34 int simPort = 9000; 33 int simPort = 9000;
35 34 /*
36 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); 35 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
37 loginServer.Startup(); 36 loginServer.Startup();
38 loginServer.SetSessionHandler( AddNewSessionHandler ); 37 loginServer.SetSessionHandler( AddNewSessionHandler );*/
39 38
40 m_circuitManager = new AuthenticateSessionsBase(); 39 m_circuitManager = new AuthenticateSessionsBase();
41 40
@@ -64,7 +63,7 @@ namespace SimpleApp
64 // world.PhysicsScene = physicsScene; 63 // world.PhysicsScene = physicsScene;
65 // udpServer.LocalWorld = world; 64 // udpServer.LocalWorld = world;
66 65
67 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); 66 // httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
68 httpServer.Start(); 67 httpServer.Start();
69 68
70 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 69 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index 27d4828..13a351d 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -17,7 +17,6 @@ namespace OpenSim.Region
17 17
18 public class Caps 18 public class Caps
19 { 19 {
20
21 private string httpListenerAddress; 20 private string httpListenerAddress;
22 private uint httpListenPort; 21 private uint httpListenPort;
23 private string capsObjectPath = "00001-"; 22 private string capsObjectPath = "00001-";
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index ffec3e5..45d3fed 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Scenes
99 99
100 m_regionInfo = reginfo; 100 m_regionInfo = reginfo;
101 m_regionHandle = reginfo.RegionHandle; 101 m_regionHandle = reginfo.RegionHandle;
102 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Avatar.cs - Loading details from grid (DUMMY)"); 102 OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
103 ControllingClient = theClient; 103 ControllingClient = theClient;
104 this.firstname = ControllingClient.FirstName; 104 this.firstname = ControllingClient.FirstName;
105 this.lastname = ControllingClient.LastName; 105 this.lastname = ControllingClient.LastName;
@@ -216,8 +216,7 @@ namespace OpenSim.Region.Scenes
216 /// </summary> 216 /// </summary>
217 /// <param name="pack"></param> 217 /// <param name="pack"></param>
218 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) 218 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
219 { 219 {
220
221 if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0) 220 if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
222 { 221 {
223 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 222 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
index fd16e93..68a140b 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
@@ -41,7 +41,6 @@ using OpenSim.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.UserServer;
45using OpenSim.Assets; 44using OpenSim.Assets;
46using OpenSim.Caches; 45using OpenSim.Caches;
47using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 002e664..f2a02d9 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -40,7 +40,6 @@ using libsecondlife.Packets;
40using OpenSim.Terrain; 40using OpenSim.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.UserServer;
44using OpenSim.Assets; 43using OpenSim.Assets;
45using OpenSim.Caches; 44using OpenSim.Caches;
46using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 7254560..40701b0 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.UserServer;
32using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
33 32
34namespace OpenSim 33namespace OpenSim
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index a6ad15d..7da2263 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -44,7 +44,6 @@ using OpenSim.Terrain;
44using OpenSim.Framework.Interfaces; 44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Types; 45using OpenSim.Framework.Types;
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.UserServer;
48using OpenSim.Assets; 47using OpenSim.Assets;
49using OpenSim.Caches; 48using OpenSim.Caches;
50using OpenSim.Framework.Console; 49using OpenSim.Framework.Console;
@@ -129,21 +128,11 @@ namespace OpenSim
129 128
130 m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server"); 129 m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");
131 130
132 //Login server setup 131
133 LoginServer loginServer = null;
134 LoginServer adminLoginServer = null;
135 132
136 if (m_sandbox) 133 if (m_sandbox)
137 { 134 {
138 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); 135 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
139
140 /*
141 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
142 loginServer.Startup();
143 loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession);
144 //sandbox mode with loginserver not using accounts
145 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
146 */
147 } 136 }
148 137
149 //Start http server 138 //Start http server
diff --git a/prebuild.xml b/prebuild.xml
index d67ca4a..b380815 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -530,6 +530,7 @@
530 <Reference name="System"/> 530 <Reference name="System"/>
531 <Reference name="System.Xml"/> 531 <Reference name="System.Xml"/>
532 <Reference name="System.Data"/> 532 <Reference name="System.Data"/>
533 <Reference name="System.Runtime.Remoting"/>
533 <Reference name="OpenSim.Framework"/> 534 <Reference name="OpenSim.Framework"/>
534 <Reference name="OpenSim.Framework.Console"/> 535 <Reference name="OpenSim.Framework.Console"/>
535 <Reference name="OpenSim.Servers"/> 536 <Reference name="OpenSim.Servers"/>
generated by cgit v1.1 at 2024-11-15 07:22:47 +0000