aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AgentCircuitData.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Framework/AgentCircuitData.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-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 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 8c184c4..045bd00 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -26,23 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using libsecondlife; 29using OpenMetaverse;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 public class AgentCircuitData 33 public class AgentCircuitData
34 { 34 {
35 public LLUUID AgentID; 35 public UUID AgentID;
36 public LLUUID BaseFolder; 36 public UUID BaseFolder;
37 public string CapsPath = String.Empty; 37 public string CapsPath = String.Empty;
38 public bool child; 38 public bool child;
39 public uint circuitcode; 39 public uint circuitcode;
40 public string firstname; 40 public string firstname;
41 public LLUUID InventoryFolder; 41 public UUID InventoryFolder;
42 public string lastname; 42 public string lastname;
43 public LLUUID SecureSessionID; 43 public UUID SecureSessionID;
44 public LLUUID SessionID; 44 public UUID SessionID;
45 public LLVector3 startpos; 45 public Vector3 startpos;
46 46
47 public AgentCircuitData() 47 public AgentCircuitData()
48 { 48 {
@@ -50,16 +50,16 @@ namespace OpenSim.Framework
50 50
51 public AgentCircuitData(sAgentCircuitData cAgent) 51 public AgentCircuitData(sAgentCircuitData cAgent)
52 { 52 {
53 AgentID = new LLUUID(cAgent.AgentID); 53 AgentID = new UUID(cAgent.AgentID);
54 SessionID = new LLUUID(cAgent.SessionID); 54 SessionID = new UUID(cAgent.SessionID);
55 SecureSessionID = new LLUUID(cAgent.SecureSessionID); 55 SecureSessionID = new UUID(cAgent.SecureSessionID);
56 startpos = new LLVector3(cAgent.startposx, cAgent.startposy, cAgent.startposz); 56 startpos = new Vector3(cAgent.startposx, cAgent.startposy, cAgent.startposz);
57 firstname = cAgent.firstname; 57 firstname = cAgent.firstname;
58 lastname = cAgent.lastname; 58 lastname = cAgent.lastname;
59 circuitcode = cAgent.circuitcode; 59 circuitcode = cAgent.circuitcode;
60 child = cAgent.child; 60 child = cAgent.child;
61 InventoryFolder = new LLUUID(cAgent.InventoryFolder); 61 InventoryFolder = new UUID(cAgent.InventoryFolder);
62 BaseFolder = new LLUUID(cAgent.BaseFolder); 62 BaseFolder = new UUID(cAgent.BaseFolder);
63 CapsPath = cAgent.CapsPath; 63 CapsPath = cAgent.CapsPath;
64 } 64 }
65 } 65 }
@@ -87,9 +87,9 @@ namespace OpenSim.Framework
87 87
88 public sAgentCircuitData(AgentCircuitData cAgent) 88 public sAgentCircuitData(AgentCircuitData cAgent)
89 { 89 {
90 AgentID = cAgent.AgentID.UUID; 90 AgentID = cAgent.AgentID.Guid;
91 SessionID = cAgent.SessionID.UUID; 91 SessionID = cAgent.SessionID.Guid;
92 SecureSessionID = cAgent.SecureSessionID.UUID; 92 SecureSessionID = cAgent.SecureSessionID.Guid;
93 startposx = cAgent.startpos.X; 93 startposx = cAgent.startpos.X;
94 startposy = cAgent.startpos.Y; 94 startposy = cAgent.startpos.Y;
95 startposz = cAgent.startpos.Z; 95 startposz = cAgent.startpos.Z;
@@ -97,9 +97,9 @@ namespace OpenSim.Framework
97 lastname = cAgent.lastname; 97 lastname = cAgent.lastname;
98 circuitcode = cAgent.circuitcode; 98 circuitcode = cAgent.circuitcode;
99 child = cAgent.child; 99 child = cAgent.child;
100 InventoryFolder = cAgent.InventoryFolder.UUID; 100 InventoryFolder = cAgent.InventoryFolder.Guid;
101 BaseFolder = cAgent.BaseFolder.UUID; 101 BaseFolder = cAgent.BaseFolder.Guid;
102 CapsPath = cAgent.CapsPath; 102 CapsPath = cAgent.CapsPath;
103 } 103 }
104 } 104 }
105} \ No newline at end of file 105}