From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sat, 6 Sep 2008 07:52:41 +0000
Subject: * This is the fabled LibOMV update with all of the libOMV types from
 JHurliman * This is a HUGE OMG update and will definitely have unknown side
 effects.. so this is really only for the strong hearted at this point. 
 Regular people should let the dust settle. * This has been tested to work
 with most basic functions. However..   make sure you back up 'everything'
 before using this.  It's that big! * Essentially we're back at square 1 in
 the testing phase..  so lets identify things that broke.

---
 OpenSim/Framework/Communications/LoginResponse.cs | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'OpenSim/Framework/Communications/LoginResponse.cs')

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 686d1bb..16be2b7 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -29,8 +29,8 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
-using libsecondlife;
-using libsecondlife.StructuredData;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 using log4net;
 using Nwc.XmlRpc;
 
@@ -63,9 +63,9 @@ namespace OpenSim.Framework.Communications
 
         private UserInfo userProfile;
 
-        private LLUUID agentID;
-        private LLUUID sessionID;
-        private LLUUID secureSessionID;
+        private UUID agentID;
+        private UUID sessionID;
+        private UUID secureSessionID;
 
         // Login Flags
         private string dst;
@@ -171,9 +171,9 @@ namespace OpenSim.Framework.Communications
             AddClassifiedCategory((Int32) 8, "Service");
             AddClassifiedCategory((Int32) 9, "Personal");
 
-            SessionID = LLUUID.Random();
-            SecureSessionID = LLUUID.Random();
-            AgentID = LLUUID.Random();
+            SessionID = UUID.Random();
+            SecureSessionID = UUID.Random();
+            AgentID = UUID.Random();
 
             Hashtable InitialOutfitHash = new Hashtable();
             InitialOutfitHash["folder_name"] = "Nightclub Female";
@@ -567,19 +567,19 @@ namespace OpenSim.Framework.Communications
             set { simAddress = value; }
         }
 
-        public LLUUID AgentID
+        public UUID AgentID
         {
             get { return agentID; }
             set { agentID = value; }
         }
 
-        public LLUUID SessionID
+        public UUID SessionID
         {
             get { return sessionID; }
             set { sessionID = value; }
         }
 
-        public LLUUID SecureSessionID
+        public UUID SecureSessionID
         {
             get { return secureSessionID; }
             set { secureSessionID = value; }
@@ -724,8 +724,8 @@ namespace OpenSim.Framework.Communications
             public string firstname;
             public string lastname;
             public ulong homeregionhandle;
-            public LLVector3 homepos;
-            public LLVector3 homelookat;
+            public Vector3 homepos;
+            public Vector3 homelookat;
         }
 
         public class BuddyList
@@ -754,14 +754,14 @@ namespace OpenSim.Framework.Communications
             {
                 public int BuddyRightsHave = 1;
                 public int BuddyRightsGiven = 1;
-                public LLUUID BuddyID;
+                public UUID BuddyID;
 
                 public BuddyInfo(string buddyID)
                 {
-                    BuddyID = new LLUUID(buddyID);
+                    BuddyID = new UUID(buddyID);
                 }
 
-                public BuddyInfo(LLUUID buddyID)
+                public BuddyInfo(UUID buddyID)
                 {
                     BuddyID = buddyID;
                 }
-- 
cgit v1.1