diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/Communications/LoginResponse.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* 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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 32 |
1 files changed, 16 insertions, 16 deletions
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; | |||
29 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using libsecondlife.StructuredData; | 33 | using OpenMetaverse.StructuredData; |
34 | using log4net; | 34 | using log4net; |
35 | using Nwc.XmlRpc; | 35 | using Nwc.XmlRpc; |
36 | 36 | ||
@@ -63,9 +63,9 @@ namespace OpenSim.Framework.Communications | |||
63 | 63 | ||
64 | private UserInfo userProfile; | 64 | private UserInfo userProfile; |
65 | 65 | ||
66 | private LLUUID agentID; | 66 | private UUID agentID; |
67 | private LLUUID sessionID; | 67 | private UUID sessionID; |
68 | private LLUUID secureSessionID; | 68 | private UUID secureSessionID; |
69 | 69 | ||
70 | // Login Flags | 70 | // Login Flags |
71 | private string dst; | 71 | private string dst; |
@@ -171,9 +171,9 @@ namespace OpenSim.Framework.Communications | |||
171 | AddClassifiedCategory((Int32) 8, "Service"); | 171 | AddClassifiedCategory((Int32) 8, "Service"); |
172 | AddClassifiedCategory((Int32) 9, "Personal"); | 172 | AddClassifiedCategory((Int32) 9, "Personal"); |
173 | 173 | ||
174 | SessionID = LLUUID.Random(); | 174 | SessionID = UUID.Random(); |
175 | SecureSessionID = LLUUID.Random(); | 175 | SecureSessionID = UUID.Random(); |
176 | AgentID = LLUUID.Random(); | 176 | AgentID = UUID.Random(); |
177 | 177 | ||
178 | Hashtable InitialOutfitHash = new Hashtable(); | 178 | Hashtable InitialOutfitHash = new Hashtable(); |
179 | InitialOutfitHash["folder_name"] = "Nightclub Female"; | 179 | InitialOutfitHash["folder_name"] = "Nightclub Female"; |
@@ -567,19 +567,19 @@ namespace OpenSim.Framework.Communications | |||
567 | set { simAddress = value; } | 567 | set { simAddress = value; } |
568 | } | 568 | } |
569 | 569 | ||
570 | public LLUUID AgentID | 570 | public UUID AgentID |
571 | { | 571 | { |
572 | get { return agentID; } | 572 | get { return agentID; } |
573 | set { agentID = value; } | 573 | set { agentID = value; } |
574 | } | 574 | } |
575 | 575 | ||
576 | public LLUUID SessionID | 576 | public UUID SessionID |
577 | { | 577 | { |
578 | get { return sessionID; } | 578 | get { return sessionID; } |
579 | set { sessionID = value; } | 579 | set { sessionID = value; } |
580 | } | 580 | } |
581 | 581 | ||
582 | public LLUUID SecureSessionID | 582 | public UUID SecureSessionID |
583 | { | 583 | { |
584 | get { return secureSessionID; } | 584 | get { return secureSessionID; } |
585 | set { secureSessionID = value; } | 585 | set { secureSessionID = value; } |
@@ -724,8 +724,8 @@ namespace OpenSim.Framework.Communications | |||
724 | public string firstname; | 724 | public string firstname; |
725 | public string lastname; | 725 | public string lastname; |
726 | public ulong homeregionhandle; | 726 | public ulong homeregionhandle; |
727 | public LLVector3 homepos; | 727 | public Vector3 homepos; |
728 | public LLVector3 homelookat; | 728 | public Vector3 homelookat; |
729 | } | 729 | } |
730 | 730 | ||
731 | public class BuddyList | 731 | public class BuddyList |
@@ -754,14 +754,14 @@ namespace OpenSim.Framework.Communications | |||
754 | { | 754 | { |
755 | public int BuddyRightsHave = 1; | 755 | public int BuddyRightsHave = 1; |
756 | public int BuddyRightsGiven = 1; | 756 | public int BuddyRightsGiven = 1; |
757 | public LLUUID BuddyID; | 757 | public UUID BuddyID; |
758 | 758 | ||
759 | public BuddyInfo(string buddyID) | 759 | public BuddyInfo(string buddyID) |
760 | { | 760 | { |
761 | BuddyID = new LLUUID(buddyID); | 761 | BuddyID = new UUID(buddyID); |
762 | } | 762 | } |
763 | 763 | ||
764 | public BuddyInfo(LLUUID buddyID) | 764 | public BuddyInfo(UUID buddyID) |
765 | { | 765 | { |
766 | BuddyID = buddyID; | 766 | BuddyID = buddyID; |
767 | } | 767 | } |