*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData)

*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login
*Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message

3 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 99e9c96..e8ed7f4 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
             

             GridParams["authkey"] =  serversInfo.GridSendKey;

             GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();

-            GridParams["sim_ip"] = regionInfo.InternalEndPoint.Address.ToString();

+            GridParams["sim_ip"] = regionInfo.ExternalHostName;

             GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();

             GridParams["region_locx"] = regionInfo.RegionLocX.ToString();

             GridParams["region_locy"] = regionInfo.RegionLocY.ToString();

@@ -166,6 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
         // Grid Request Processing

         public XmlRpcResponse ExpectUser(XmlRpcRequest request)

         {

+            Console.WriteLine("Expecting User...");

             Hashtable requestData = (Hashtable)request.Params[0];

             AgentCircuitData agentData = new AgentCircuitData();

             agentData.SessionID = new LLUUID((string)requestData["session_id"]);

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index d6abd13..390326e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,16 +116,16 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="CommunicationsOGS1.cs">

+    <Compile Include="OGS1UserServices.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGS1GridServices.cs">

+    <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OGS1UserServices.cs">

+    <Compile Include="OGS1GridServices.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 04d61b9..06f0b9e 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="OGS1UserServices.cs" />

                 <include name="CommunicationsOGS1.cs" />

-                <include name="OGS1GridServices.cs" />

                 <include name="OGS1InterSimComms.cs" />

-                <include name="OGS1UserServices.cs" />

+                <include name="OGS1GridServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">