aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common
diff options
context:
space:
mode:
authorMW2007-06-24 18:40:02 +0000
committerMW2007-06-24 18:40:02 +0000
commitd607914f6a7e0ef7890ae229474a1ad90511868f (patch)
tree0030127df56b96c774faaf8e73a74620d0a13c54 /Common
parent* Updated to use multi-listeners (diff)
downloadopensim-SC_OLD-d607914f6a7e0ef7890ae229474a1ad90511868f.zip
opensim-SC_OLD-d607914f6a7e0ef7890ae229474a1ad90511868f.tar.gz
opensim-SC_OLD-d607914f6a7e0ef7890ae229474a1ad90511868f.tar.bz2
opensim-SC_OLD-d607914f6a7e0ef7890ae229474a1ad90511868f.tar.xz
Hopefully enabled the OGS commsManager
Diffstat (limited to 'Common')
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs18
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs19
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs25
-rw-r--r--Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj52
-rw-r--r--Common/OpenSim.Framework/Types/NetworkServersInfo.cs54
5 files changed, 131 insertions, 37 deletions
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
new file mode 100644
index 0000000..f151f56
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
@@ -0,0 +1,18 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenGrid.Framework.Communications;
5namespace OpenGrid.Framework.Communications.OGS1
6{
7 public class GridCommsManager : CommunicationsManager
8 {
9
10
11 public GridCommsManager()
12 {
13 GridServer = new OGS1GridServices();
14 InterRegion = new OGSInterSimComms();
15 UserServer = new OGSUserServices();
16 }
17 }
18}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
new file mode 100644
index 0000000..0024d14
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
@@ -0,0 +1,19 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Types;
5using OpenGrid.Framework.Communications;
6namespace OpenGrid.Framework.Communications.OGS1
7{
8 public class OGSInterSimComms : IInterRegionCommunications
9 {
10 public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
11 {
12 return false;
13 }
14 public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
15 {
16 return false;
17 }
18 }
19}
diff --git a/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
new file mode 100644
index 0000000..1667e6b
--- /dev/null
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs
@@ -0,0 +1,25 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenGrid.Framework.Communications;
5using OpenGrid.Framework.Data;
6using libsecondlife;
7
8namespace OpenGrid.Framework.Communications.OGS1
9{
10 public class OGSUserServices :IUserServices
11 {
12 public UserProfileData GetUserProfile(string firstName, string lastName)
13 {
14 return null;
15 }
16 public UserProfileData GetUserProfile(string name)
17 {
18 return null;
19 }
20 public UserProfileData GetUserProfile(LLUUID avatarID)
21 {
22 return null;
23 }
24 }
25}
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 fdd056a..4a80635 100644
--- a/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
+++ b/Common/OpenGrid.Framework.Communications.OGS1/OpenGrid.Framework.Communications.OGS1.csproj
@@ -1,12 +1,13 @@
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>
5 <SchemaVersion>2.0</SchemaVersion> 5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</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,23 @@
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.Xml">
74 <HintPath>System.Xml.dll</HintPath> 81 <HintPath>System.Xml.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
@@ -80,37 +87,44 @@
80 <Name>OpenGrid.Framework.Communications</Name> 87 <Name>OpenGrid.Framework.Communications</Name>
81 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 88 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 89 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 90 <Private>False</Private>
91 </ProjectReference>
92 <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
93 <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
94 <Name>OpenGrid.Framework.Data</Name>
84 </ProjectReference> 95 </ProjectReference>
85 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj"> 96 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
86 <Name>OpenSim.Framework</Name> 97 <Name>OpenSim.Framework</Name>
87 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 98 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
88 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 99 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
89 <Private>False</Private> 100 <Private>False</Private>
90 </ProjectReference> 101 </ProjectReference>
91 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 102 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
92 <Name>OpenSim.Framework.Console</Name> 103 <Name>OpenSim.Framework.Console</Name>
93 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 104 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
94 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 105 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
95 <Private>False</Private> 106 <Private>False</Private>
96 </ProjectReference> 107 </ProjectReference>
97 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj"> 108 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
98 <Name>OpenSim.Servers</Name> 109 <Name>OpenSim.Servers</Name>
99 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 110 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
100 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 111 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
101 <Private>False</Private> 112 <Private>False</Private>
102 </ProjectReference> 113 </ProjectReference>
103 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj"> 114 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
104 <Name>XMLRPC</Name> 115 <Name>XMLRPC</Name>
105 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 116 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
106 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 117 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
107 <Private>False</Private> 118 <Private>False</Private>
108 </ProjectReference> 119 </ProjectReference>
109 </ItemGroup> 120 </ItemGroup>
110 <ItemGroup> 121 <ItemGroup>
122 <Compile Include="GridCommsManager.cs" />
111 <Compile Include="OGS1GridServices.cs"> 123 <Compile Include="OGS1GridServices.cs">
112 <SubType>Code</SubType> 124 <SubType>Code</SubType>
113 </Compile> 125 </Compile>
126 <Compile Include="OGSInterSimComms.cs" />
127 <Compile Include="OGSUserServices.cs" />
114 <Compile Include="Properties\AssemblyInfo.cs"> 128 <Compile Include="Properties\AssemblyInfo.cs">
115 <SubType>Code</SubType> 129 <SubType>Code</SubType>
116 </Compile> 130 </Compile>
@@ -122,4 +136,4 @@
122 <PostBuildEvent> 136 <PostBuildEvent>
123 </PostBuildEvent> 137 </PostBuildEvent>
124 </PropertyGroup> 138 </PropertyGroup>
125</Project> 139</Project> \ No newline at end of file
diff --git a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
index 709b7dd..9c2e7a6 100644
--- a/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
+++ b/Common/OpenSim.Framework/Types/NetworkServersInfo.cs
@@ -48,6 +48,8 @@ namespace OpenSim.Framework.Types
48 public uint DefaultHomeLocX = 0; 48 public uint DefaultHomeLocX = 0;
49 public uint DefaultHomeLocY = 0; 49 public uint DefaultHomeLocY = 0;
50 50
51 public int HttpListenerPort = 9000;
52
51 public void InitConfig(bool sandboxMode, IGenericConfig configData) 53 public void InitConfig(bool sandboxMode, IGenericConfig configData)
52 { 54 {
53 this.isSandbox = sandboxMode; 55 this.isSandbox = sandboxMode;
@@ -55,34 +57,50 @@ namespace OpenSim.Framework.Types
55 try 57 try
56 { 58 {
57 string attri = ""; 59 string attri = "";
58 // default home location X 60
59 attri = ""; 61 attri = "";
60 attri = configData.GetAttribute("DefaultLocationX"); 62 attri = configData.GetAttribute("HttpListenerPort");
61 if (attri == "") 63 if (attri == "")
62 { 64 {
63 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000"); 65 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
64 configData.SetAttribute("DefaultLocationX", location); 66 configData.SetAttribute("HttpListenerPort", location);
65 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location); 67 this.HttpListenerPort = Convert.ToInt32(location);
66 } 68 }
67 else 69 else
68 { 70 {
69 this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri); 71 this.HttpListenerPort = Convert.ToInt32(attri);
70 } 72 }
71 73
72 // default home location Y 74 if (sandboxMode)
73 attri = "";
74 attri = configData.GetAttribute("DefaultLocationY");
75 if (attri == "")
76 {
77 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
78 configData.SetAttribute("DefaultLocationY", location);
79 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
80 }
81 else
82 { 75 {
83 this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri); 76 // default home location X
84 } 77 attri = "";
78 attri = configData.GetAttribute("DefaultLocationX");
79 if (attri == "")
80 {
81 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
82 configData.SetAttribute("DefaultLocationX", location);
83 this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
84 }
85 else
86 {
87 this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
88 }
85 89
90 // default home location Y
91 attri = "";
92 attri = configData.GetAttribute("DefaultLocationY");
93 if (attri == "")
94 {
95 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
96 configData.SetAttribute("DefaultLocationY", location);
97 this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
98 }
99 else
100 {
101 this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
102 }
103 }
86 if (!isSandbox) 104 if (!isSandbox)
87 { 105 {
88 //Grid Server 106 //Grid Server