brought zircon branch into trunk

7 files changed, 18 insertions, 20 deletions

diff --git a/ogs/gridserver/default.build b/OGS/gridserver/default.build
index b113b83..b113b83 100644
--- a/ogs/gridserver/default.build
+++ b/OGS/gridserver/default.build
diff --git a/ogs/gridserver/src/ConsoleCmds.cs b/OGS/gridserver/src/ConsoleCmds.cs
index 82a2279..82a2279 100644
--- a/ogs/gridserver/src/ConsoleCmds.cs
+++ b/OGS/gridserver/src/ConsoleCmds.cs
diff --git a/ogs/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs
index 833a8ac..496a3bc 100644
--- a/ogs/gridserver/src/GridHttp.cs
+++ b/OGS/gridserver/src/GridHttp.cs
@@ -38,6 +38,7 @@ using System.Collections;
 using System.Collections.Generic;

 using libsecondlife;

 using ServerConsole;

+using OpenSim.Framework.Sims;

 

 namespace OpenGridServices

 {

@@ -73,7 +74,7 @@ namespace OpenGridServices
                         switch(request.MethodName) {

                                 case "get_sim_info":

                                         ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);

-                                        SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);

+                                        SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);

                                         string RecvKey="";

                                         string caller=(string)requestData["caller"];

                                         switch(caller) {

diff --git a/ogs/gridserver/src/Main.cs b/OGS/gridserver/src/Main.cs
index d29a1ae..d29a1ae 100644
--- a/ogs/gridserver/src/Main.cs
+++ b/OGS/gridserver/src/Main.cs
diff --git a/ogs/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj
index d984e9a..b957d40 100644
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ b/OGS/gridserver/src/OGS-GridServer.csproj
@@ -40,9 +40,6 @@
     <Compile Include="..\..\common\src\OGS-Console.cs">

       <Link>OGS-Console.cs</Link>

     </Compile>

-    <Compile Include="..\..\common\src\Util.cs">

-      <Link>Util.cs</Link>

-    </Compile>

     <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">

       <Link>VersionInfo.cs</Link>

     </Compile>

@@ -53,17 +50,14 @@
     <Compile Include="SimProfiles.cs" />

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">

+      <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>

+      <Name>OpenSim.Framework</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">

       <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>

       <Name>ServerConsole</Name>

     </ProjectReference>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

-       Other similar extension points exist, see Microsoft.Common.targets.

-  <Target Name="BeforeBuild">

-  </Target>

-  <Target Name="AfterBuild">

-  </Target>

-  -->

 </Project>
\ No newline at end of file
diff --git a/ogs/gridserver/src/Properties/AssemblyInfo.cs b/OGS/gridserver/src/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/ogs/gridserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/gridserver/src/Properties/AssemblyInfo.cs
diff --git a/ogs/gridserver/src/SimProfiles.cs b/OGS/gridserver/src/SimProfiles.cs
index 91a92ea..6db8331 100644
--- a/ogs/gridserver/src/SimProfiles.cs
+++ b/OGS/gridserver/src/SimProfiles.cs
@@ -33,6 +33,8 @@ using System.Collections;
 using System.Collections.Generic;

 using libsecondlife;

 using ServerConsole;

+using OpenSim.Framework.Utilities;

+using OpenSim.Framework.Sims;

 

 namespace OpenGridServices

 {

@@ -40,7 +42,7 @@ namespace OpenGridServices
         /// </summary>

         public class SimProfileManager {

         

-                public Dictionary<LLUUID, SimProfile> SimProfiles = new Dictionary<LLUUID, SimProfile>();

+                public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();

 

                 public SimProfileManager() {

                 }

@@ -49,19 +51,19 @@ namespace OpenGridServices
                         // TODO: need to load from database

                 }

 

-                public SimProfile GetProfileByHandle(ulong reqhandle) {

+                public SimProfileBase GetProfileByHandle(ulong reqhandle) {

                         foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {

                                 if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];

                         }

                         return null;

                 }

 

-                public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) {

+                public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {

                         return SimProfiles[ProfileLLUUID];

                 }

         

                 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {

-                        SimProfile TheSim=GetProfileByHandle(regionhandle);

+                        SimProfileBase TheSim=GetProfileByHandle(regionhandle);

                         if(TheSim != null) 

                         if(TheSim.recvkey==simrecvkey) {

                                 return true;

@@ -71,8 +73,8 @@ namespace OpenGridServices
                         

                 }

 

-                public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {

-                        SimProfile newprofile = new SimProfile();

+                public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {

+                        SimProfileBase newprofile = new SimProfileBase();

                         newprofile.regionname=regionname;

                         newprofile.sim_ip=sim_ip;

                         newprofile.sim_port=sim_port;

@@ -89,7 +91,8 @@ namespace OpenGridServices
 

         }

 

-        public class SimProfile {

+    /*  is in OpenSim.Framework

+        public class SimProfileBase {

                 public LLUUID UUID;

                 public ulong regionhandle;

                 public string regionname;

@@ -102,10 +105,10 @@ namespace OpenGridServices
                 public string recvkey;

                 

         

-                public SimProfile() {

+                public SimProfileBase() {

                 }

         

         

-        }

+        }*/

 

 }