From 375163a6fece8b3a57c7555246abe8338223a599 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 29 Apr 2008 14:04:55 +0000
Subject: * Spring cleaning. * Added new generic "Location" class to handle 2D
integer locations. Going to use it to replace all RegionHandle and X,Y
coordinate references throughout the entire project. You have been warned.
---
OpenSim/Framework/UserAgentData.cs | 192 ++++++++++++++++---------------------
1 file changed, 80 insertions(+), 112 deletions(-)
(limited to 'OpenSim/Framework/UserAgentData.cs')
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs
index e4dd658..de09ce2 100644
--- a/OpenSim/Framework/UserAgentData.cs
+++ b/OpenSim/Framework/UserAgentData.cs
@@ -36,41 +36,34 @@ namespace OpenSim.Framework
public class UserAgentData
{
///
- /// The UUID of the users avatar (not the agent!)
- ///
- private LLUUID UUID;
-
- ///
/// The IP address of the user
///
private string agentIP = String.Empty;
///
- /// The port of the user
-
+ /// Is the user online?
///
- private uint agentPort;
+ private bool agentOnline;
///
- /// Is the user online?
+ /// The port of the user
///
- private bool agentOnline;
+ private uint agentPort;
///
- /// The session ID for the user (also the agent ID)
+ /// Region handle of the current region the user is in
///
- private LLUUID sessionID;
+ private ulong currentHandle;
///
- /// The "secure" session ID for the user
+ /// The position of the user within the region
///
- /// Not very secure. Dont rely on it for anything more than Linden Lab does.
- private LLUUID secureSessionID;
+ private LLVector3 currentPos;
///
- /// The region the user logged into initially
+ /// Current region the user is logged into
///
- private LLUUID regionID;
+ private LLUUID currentRegion;
///
/// A unix timestamp from when the user logged in
@@ -83,139 +76,114 @@ namespace OpenSim.Framework
private int logoutTime;
///
- /// Current region the user is logged into
+ /// The region the user logged into initially
///
- private LLUUID currentRegion;
+ private LLUUID regionID;
///
- /// Region handle of the current region the user is in
+ /// The "secure" session ID for the user
///
- private ulong currentHandle;
+ /// Not very secure. Dont rely on it for anything more than Linden Lab does.
+ private LLUUID secureSessionID;
///
- /// The position of the user within the region
+ /// The session ID for the user (also the agent ID)
///
- private LLVector3 currentPos;
-
- public LLUUID ProfileID {
- get {
- return UUID;
- }
- set {
- UUID = value;
- }
+ private LLUUID sessionID;
+
+ ///
+ /// The UUID of the users avatar (not the agent!)
+ ///
+ private LLUUID UUID;
+
+ public LLUUID ProfileID
+ {
+ get { return UUID; }
+ set { UUID = value; }
}
- public string AgentIP {
- get {
- return agentIP;
- }
- set {
- agentIP = value;
- }
+ public string AgentIP
+ {
+ get { return agentIP; }
+ set { agentIP = value; }
}
- public uint AgentPort {
- get {
- return agentPort;
- }
- set {
- agentPort = value;
- }
+ public uint AgentPort
+ {
+ get { return agentPort; }
+ set { agentPort = value; }
}
- public bool AgentOnline {
- get {
- return agentOnline;
- }
- set {
- agentOnline = value;
- }
+ public bool AgentOnline
+ {
+ get { return agentOnline; }
+ set { agentOnline = value; }
}
- public LLUUID SessionID {
- get {
- return sessionID;
- }
- set {
- sessionID = value;
- }
+ public LLUUID SessionID
+ {
+ get { return sessionID; }
+ set { sessionID = value; }
}
- public LLUUID SecureSessionID {
- get {
- return secureSessionID;
- }
- set {
- secureSessionID = value;
- }
+ public LLUUID SecureSessionID
+ {
+ get { return secureSessionID; }
+ set { secureSessionID = value; }
}
- public LLUUID InitialRegion {
- get {
- return regionID;
- }
- set {
- regionID = value;
- }
+ public LLUUID InitialRegion
+ {
+ get { return regionID; }
+ set { regionID = value; }
}
- public int LoginTime {
- get {
- return loginTime;
- }
- set {
- loginTime = value;
- }
+ public int LoginTime
+ {
+ get { return loginTime; }
+ set { loginTime = value; }
}
- public int LogoutTime {
- get {
- return logoutTime;
- }
- set {
- logoutTime = value;
- }
+ public int LogoutTime
+ {
+ get { return logoutTime; }
+ set { logoutTime = value; }
}
- public LLUUID Region {
- get {
- return currentRegion;
- }
- set {
- currentRegion = value;
- }
+ public LLUUID Region
+ {
+ get { return currentRegion; }
+ set { currentRegion = value; }
}
- public ulong Handle {
- get {
- return currentHandle;
- }
- set {
- currentHandle = value;
- }
+ public ulong Handle
+ {
+ get { return currentHandle; }
+ set { currentHandle = value; }
}
- public LLVector3 Position {
- get {
- return currentPos;
- }
- set {
- currentPos = value;
- }
+ public LLVector3 Position
+ {
+ get { return currentPos; }
+ set { currentPos = value; }
}
- public float PositionX {
+ public float PositionX
+ {
get { return currentPos.X; }
set { currentPos.X = value; }
}
- public float PositionY {
+
+ public float PositionY
+ {
get { return currentPos.Y; }
set { currentPos.Y = value; }
}
- public float PositionZ {
+
+ public float PositionZ
+ {
get { return currentPos.Z; }
set { currentPos.Z = value; }
}
}
-}
+}
\ No newline at end of file
--
cgit v1.1