From d607914f6a7e0ef7890ae229474a1ad90511868f Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 24 Jun 2007 18:40:02 +0000
Subject: Hopefully enabled the OGS commsManager

---
 .../GridCommsManager.cs                            | 18 ++++++++
 .../OGSInterSimComms.cs                            | 19 ++++++++
 .../OGSUserServices.cs                             | 25 ++++++++++
 .../OpenGrid.Framework.Communications.OGS1.csproj  | 52 +++++++++++++--------
 .../OpenSim.Framework/Types/NetworkServersInfo.cs  | 54 ++++++++++++++--------
 5 files changed, 131 insertions(+), 37 deletions(-)
 create mode 100644 Common/OpenGrid.Framework.Communications.OGS1/GridCommsManager.cs
 create mode 100644 Common/OpenGrid.Framework.Communications.OGS1/OGSInterSimComms.cs
 create mode 100644 Common/OpenGrid.Framework.Communications.OGS1/OGSUserServices.cs

(limited to 'Common')

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 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenGrid.Framework.Communications;
+namespace OpenGrid.Framework.Communications.OGS1
+{
+    public class GridCommsManager : CommunicationsManager
+    {
+       
+
+        public GridCommsManager()
+        {
+            GridServer = new OGS1GridServices();
+            InterRegion = new OGSInterSimComms();
+            UserServer = new OGSUserServices();
+        }
+    }
+}
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 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework.Types;
+using OpenGrid.Framework.Communications;
+namespace OpenGrid.Framework.Communications.OGS1
+{
+    public class OGSInterSimComms  : IInterRegionCommunications
+    {
+        public bool InformRegionOfChildAgent(ulong regionHandle, AgentCircuitData agentData)
+        {
+            return false;
+        }
+        public bool ExpectAvatarCrossing(ulong regionHandle, libsecondlife.LLUUID agentID, libsecondlife.LLVector3 position)
+        {
+            return false;
+        }
+    }
+}
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 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenGrid.Framework.Communications;
+using OpenGrid.Framework.Data;
+using libsecondlife;
+
+namespace OpenGrid.Framework.Communications.OGS1
+{
+    public class OGSUserServices :IUserServices
+    {
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(string name)
+        {
+            return null;
+        }
+        public UserProfileData GetUserProfile(LLUUID avatarID)
+        {
+            return null;
+        }
+    }
+}
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 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
     <ProductVersion>8.0.50727</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{17442AF1-0000-0000-0000-000000000000}</ProjectGuid>
+    <ProjectGuid>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
     <AssemblyName>OpenGrid.Framework.Communications.OGS1</AssemblyName>
@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
+    <AppDesignerFolder>
+    </AppDesignerFolder>
     <RootNamespace>OpenGrid.Framework.Communications.OGS1</RootNamespace>
-    <StartupObject></StartupObject>
+    <StartupObject>
+    </StartupObject>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
   </PropertyGroup>
@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>True</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
     <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <DebugSymbols>False</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <Optimize>True</Optimize>
@@ -55,22 +61,23 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
+    <NoWarn>
+    </NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="libsecondlife.dll" >
+    <Reference Include="libsecondlife.dll">
       <HintPath>..\..\bin\libsecondlife.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System" >
+    <Reference Include="System">
       <HintPath>System.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data" >
+    <Reference Include="System.Data">
       <HintPath>System.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Xml" >
+    <Reference Include="System.Xml">
       <HintPath>System.Xml.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -80,37 +87,44 @@
       <Name>OpenGrid.Framework.Communications</Name>
       <Project>{683344D5-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\OpenGrid.Framework.Data\OpenGrid.Framework.Data.csproj">
+      <Project>{62CDF671-0000-0000-0000-000000000000}</Project>
+      <Name>OpenGrid.Framework.Data</Name>
     </ProjectReference>
     <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
       <Name>OpenSim.Framework</Name>
       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
       <Name>OpenSim.Framework.Console</Name>
       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\OpenSim.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>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
       <Name>XMLRPC</Name>
       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GridCommsManager.cs" />
     <Compile Include="OGS1GridServices.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="OGSInterSimComms.cs" />
+    <Compile Include="OGSUserServices.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -122,4 +136,4 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
+</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
         public uint DefaultHomeLocX = 0;
         public uint DefaultHomeLocY = 0;
 
+        public int HttpListenerPort = 9000;
+
         public void InitConfig(bool sandboxMode, IGenericConfig configData)
         {
             this.isSandbox = sandboxMode;
@@ -55,34 +57,50 @@ namespace OpenSim.Framework.Types
             try
             {
                 string attri = "";
-                // default home location X
+
                 attri = "";
-                attri = configData.GetAttribute("DefaultLocationX");
+                attri = configData.GetAttribute("HttpListenerPort");
                 if (attri == "")
                 {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
-                    configData.SetAttribute("DefaultLocationX", location);
-                    this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
+                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Http Listener Port", "9000");
+                    configData.SetAttribute("HttpListenerPort", location);
+                    this.HttpListenerPort = Convert.ToInt32(location);
                 }
                 else
                 {
-                    this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
+                    this.HttpListenerPort = Convert.ToInt32(attri);
                 }
 
-                // default home location Y
-                attri = "";
-                attri = configData.GetAttribute("DefaultLocationY");
-                if (attri == "")
-                {
-                    string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
-                    configData.SetAttribute("DefaultLocationY", location);
-                    this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
-                }
-                else
+                if (sandboxMode)
                 {
-                    this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
-                }
+                    // default home location X
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationX");
+                    if (attri == "")
+                    {
+                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location X", "1000");
+                        configData.SetAttribute("DefaultLocationX", location);
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocX = (uint)Convert.ToUInt32(attri);
+                    }
 
+                    // default home location Y
+                    attri = "";
+                    attri = configData.GetAttribute("DefaultLocationY");
+                    if (attri == "")
+                    {
+                        string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Default Home Location Y", "1000");
+                        configData.SetAttribute("DefaultLocationY", location);
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(location);
+                    }
+                    else
+                    {
+                        this.DefaultHomeLocY = (uint)Convert.ToUInt32(attri);
+                    }
+                }
                 if (!isSandbox)
                 {
                     //Grid Server 
-- 
cgit v1.1