brought zircon branch into trunk

1 files changed, 12 insertions, 9 deletions

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() {

                 }

         

         

-        }

+        }*/

 

 }