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/UserAgentData.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 'OpenSim/Framework/UserAgentData.cs')
-rw-r--r-- | OpenSim/Framework/UserAgentData.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs index 68f47ba..03a65c5 100644 --- a/OpenSim/Framework/UserAgentData.cs +++ b/OpenSim/Framework/UserAgentData.cs | |||
@@ -26,7 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using libsecondlife; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Framework | 31 | namespace OpenSim.Framework |
32 | { | 32 | { |
@@ -58,12 +58,12 @@ namespace OpenSim.Framework | |||
58 | /// <summary> | 58 | /// <summary> |
59 | /// The position of the user within the region | 59 | /// The position of the user within the region |
60 | /// </summary> | 60 | /// </summary> |
61 | private LLVector3 currentPos; | 61 | private Vector3 currentPos; |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// Current region the user is logged into | 64 | /// Current region the user is logged into |
65 | /// </summary> | 65 | /// </summary> |
66 | private LLUUID currentRegion; | 66 | private UUID currentRegion; |
67 | 67 | ||
68 | /// <summary> | 68 | /// <summary> |
69 | /// A unix timestamp from when the user logged in | 69 | /// A unix timestamp from when the user logged in |
@@ -78,25 +78,25 @@ namespace OpenSim.Framework | |||
78 | /// <summary> | 78 | /// <summary> |
79 | /// The region the user logged into initially | 79 | /// The region the user logged into initially |
80 | /// </summary> | 80 | /// </summary> |
81 | private LLUUID regionID; | 81 | private UUID regionID; |
82 | 82 | ||
83 | /// <summary> | 83 | /// <summary> |
84 | /// The "secure" session ID for the user | 84 | /// The "secure" session ID for the user |
85 | /// </summary> | 85 | /// </summary> |
86 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> | 86 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> |
87 | private LLUUID secureSessionID; | 87 | private UUID secureSessionID; |
88 | 88 | ||
89 | /// <summary> | 89 | /// <summary> |
90 | /// The session ID for the user (also the agent ID) | 90 | /// The session ID for the user (also the agent ID) |
91 | /// </summary> | 91 | /// </summary> |
92 | private LLUUID sessionID; | 92 | private UUID sessionID; |
93 | 93 | ||
94 | /// <summary> | 94 | /// <summary> |
95 | /// The UUID of the users avatar (not the agent!) | 95 | /// The UUID of the users avatar (not the agent!) |
96 | /// </summary> | 96 | /// </summary> |
97 | private LLUUID UUID; | 97 | private UUID UUID; |
98 | 98 | ||
99 | public virtual LLUUID ProfileID | 99 | public virtual UUID ProfileID |
100 | { | 100 | { |
101 | get { return UUID; } | 101 | get { return UUID; } |
102 | set { UUID = value; } | 102 | set { UUID = value; } |
@@ -120,19 +120,19 @@ namespace OpenSim.Framework | |||
120 | set { agentOnline = value; } | 120 | set { agentOnline = value; } |
121 | } | 121 | } |
122 | 122 | ||
123 | public virtual LLUUID SessionID | 123 | public virtual UUID SessionID |
124 | { | 124 | { |
125 | get { return sessionID; } | 125 | get { return sessionID; } |
126 | set { sessionID = value; } | 126 | set { sessionID = value; } |
127 | } | 127 | } |
128 | 128 | ||
129 | public virtual LLUUID SecureSessionID | 129 | public virtual UUID SecureSessionID |
130 | { | 130 | { |
131 | get { return secureSessionID; } | 131 | get { return secureSessionID; } |
132 | set { secureSessionID = value; } | 132 | set { secureSessionID = value; } |
133 | } | 133 | } |
134 | 134 | ||
135 | public virtual LLUUID InitialRegion | 135 | public virtual UUID InitialRegion |
136 | { | 136 | { |
137 | get { return regionID; } | 137 | get { return regionID; } |
138 | set { regionID = value; } | 138 | set { regionID = value; } |
@@ -150,7 +150,7 @@ namespace OpenSim.Framework | |||
150 | set { logoutTime = value; } | 150 | set { logoutTime = value; } |
151 | } | 151 | } |
152 | 152 | ||
153 | public virtual LLUUID Region | 153 | public virtual UUID Region |
154 | { | 154 | { |
155 | get { return currentRegion; } | 155 | get { return currentRegion; } |
156 | set { currentRegion = value; } | 156 | set { currentRegion = value; } |
@@ -162,7 +162,7 @@ namespace OpenSim.Framework | |||
162 | set { currentHandle = value; } | 162 | set { currentHandle = value; } |
163 | } | 163 | } |
164 | 164 | ||
165 | public virtual LLVector3 Position | 165 | public virtual Vector3 Position |
166 | { | 166 | { |
167 | get { return currentPos; } | 167 | get { return currentPos; } |
168 | set { currentPos = value; } | 168 | set { currentPos = value; } |
@@ -186,4 +186,4 @@ namespace OpenSim.Framework | |||
186 | set { currentPos.Z = value; } | 186 | set { currentPos.Z = value; } |
187 | } | 187 | } |
188 | } | 188 | } |
189 | } \ No newline at end of file | 189 | } |