From 583f2a9de8e503773a427facd5f81a82b40bd585 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 5 Jul 2007 15:15:28 +0000
Subject: *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

---
 OpenSim/Region/Application/OpenSim.csproj              |  6 +++---
 OpenSim/Region/Application/OpenSim.exe.build           |  2 +-
 OpenSim/Region/Application/OpenSimMain.cs              |  2 +-
 .../ClientStack/OpenSim.Region.ClientStack.csproj      | 18 +++++++++---------
 .../ClientStack/OpenSim.Region.ClientStack.dll.build   | 12 ++++++------
 .../Local/OpenSim.Region.Communications.Local.csproj   |  6 +++---
 .../OpenSim.Region.Communications.Local.dll.build      |  2 +-
 OpenSim/Region/Communications/OGS1/OGS1GridServices.cs |  3 ++-
 .../OGS1/OpenSim.Region.Communications.OGS1.csproj     |  6 +++---
 .../OGS1/OpenSim.Region.Communications.OGS1.dll.build  |  4 ++--
 OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj     |  4 ++--
 OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build  |  2 +-
 .../OpenSim.Region.Storage.LocalStorageDb4o.csproj     |  6 +++---
 .../OpenSim.Region.Storage.LocalStorageDb4o.dll.build  |  2 +-
 14 files changed, 38 insertions(+), 37 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index bec85cc..f5da23d 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,13 +170,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Application.cs">
+    <Compile Include="VersionInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="OpenSimMain.cs">
+    <Compile Include="Application.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="VersionInfo.cs">
+    <Compile Include="OpenSimMain.cs">
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 6c7d7ac..9890cfa 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="VersionInfo.cs" />
                 <include name="Application.cs" />
                 <include name="OpenSimMain.cs" />
-                <include name="VersionInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e2486bd..c5c9efc 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -481,4 +481,4 @@ namespace OpenSim
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 3093eb0..2e1d8e2 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="PacketServer.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="UDPServer.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ClientView.PacketHandlers.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="ClientView.API.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="RegionApplicationBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="ClientViewBase.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index f76a4c8..1c791d3 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="ClientStackNetworkHandler.cs" />
                 <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="ClientView.API.cs" />
-                <include name="ClientView.cs" />
+                <include name="ClientStackNetworkHandler.cs" />
+                <include name="PacketServer.cs" />
+                <include name="UDPServer.cs" />
                 <include name="ClientView.PacketHandlers.cs" />
+                <include name="ClientView.API.cs" />
                 <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientViewBase.cs" />
-                <include name="PacketServer.cs" />
                 <include name="RegionApplicationBase.cs" />
-                <include name="UDPServer.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="ClientView.cs" />
                 <include name="Assets/InventoryCache.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 0a15a49..f9f6b7d 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommunicationsLocal.cs">
+    <Compile Include="LocalUserServices.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalBackEndServices.cs">
+    <Compile Include="CommunicationsLocal.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="LocalUserServices.cs">
+    <Compile Include="LocalBackEndServices.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 3cac9d3..bfefabf 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
+                <include name="LocalUserServices.cs" />
                 <include name="CommunicationsLocal.cs" />
                 <include name="LocalBackEndServices.cs" />
-                <include name="LocalUserServices.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
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()}">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 1e726b2..d3f2518 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -154,10 +154,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LlsdMethodEntry.cs">
+    <Compile Include="MyWorld.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="MyWorld.cs">
+    <Compile Include="LlsdMethodEntry.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Program.cs">
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index a826a37..ffcf59e 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -11,8 +11,8 @@
             <resources prefix="SimpleApp" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
-                <include name="LlsdMethodEntry.cs" />
                 <include name="MyWorld.cs" />
+                <include name="LlsdMethodEntry.cs" />
                 <include name="Program.cs" />
                 <include name="Properties/AssemblyInfo.cs" />
             </sources>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 147158c..716fd57 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,9 +93,6 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="MapStorage.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -105,6 +102,9 @@
     <Compile Include="UUIDPrimQuery.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index fc9f055..112ff1c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>
             <sources failonempty="true">
                 <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
                 <include name="MapStorage.cs" />
                 <include name="UUIDParcelQuery.cs" />
                 <include name="UUIDPrimQuery.cs" />
+                <include name="Db4LocalStorage.cs" />
             </sources>
             <references basedir="${project::get-base-directory()}">
                 <lib>
-- 
cgit v1.1