1 files changed, 80 insertions, 112 deletions
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
    {
        /// <summary>
-        /// The UUID of the users avatar (not the agent!)
-        /// </summary>
-        private LLUUID UUID;
-        /// <summary>
        /// The IP address of the user
        /// </summary>
        private string agentIP = String.Empty;
        /// <summary>
-        /// The port of the user
+        /// Is the user online?
-        
        /// </summary>
-        private uint agentPort;
+        private bool agentOnline;
        /// <summary>
-        /// Is the user online?
+        /// The port of the user
        /// </summary>
-        private bool agentOnline;
+        private uint agentPort;
        /// <summary>
-        /// The session ID for the user (also the agent ID)
+        /// Region handle of the current region the user is in
        /// </summary>
-        private LLUUID sessionID;
+        private ulong currentHandle;
        /// <summary>
-        /// The "secure" session ID for the user
+        /// The position of the user within the region
        /// </summary>
-        /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
+        private LLVector3 currentPos;
-        private LLUUID secureSessionID;
        /// <summary>
-        /// The region the user logged into initially
+        /// Current region the user is logged into
        /// </summary>
-        private LLUUID regionID;
+        private LLUUID currentRegion;
        /// <summary>
        /// A unix timestamp from when the user logged in
@@ -83,139 +76,114 @@ namespace OpenSim.Framework
        private int logoutTime;
        /// <summary>
-        /// Current region the user is logged into
+        /// The region the user logged into initially
        /// </summary>
-        private LLUUID currentRegion;
+        private LLUUID regionID;
        /// <summary>
-        /// Region handle of the current region the user is in
+        /// The "secure" session ID for the user
        /// </summary>
-        private ulong currentHandle;
+        /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
+        private LLUUID secureSessionID;
        /// <summary>
-        /// The position of the user within the region
+        /// The session ID for the user (also the agent ID)
        /// </summary>
-        private LLVector3 currentPos;
+        private LLUUID sessionID;
-        
-        public LLUUID ProfileID {
+        /// <summary>
-            get {
+        /// The UUID of the users avatar (not the agent!)
-                return UUID;
+        /// </summary>
-            }
+        private LLUUID UUID;
-            set {
-                UUID = value;
+        public LLUUID ProfileID
-            }
+        {
+            get { return UUID; }
+            set { UUID = value; }
        }
-        public string AgentIP {
+        public string AgentIP
-            get {
+        {
-                return agentIP;
+            get { return agentIP; }
-            }
+            set { agentIP = value; }
-            set {
-                agentIP = value;
-            }
        }
-        public uint AgentPort {
+        public uint AgentPort
-            get {
+        {
-                return agentPort;
+            get { return agentPort; }
-            }
+            set { agentPort = value; }
-            set {
-                agentPort = value;
-            }
        }
-        public bool AgentOnline {
+        public bool AgentOnline
-            get {
+        {
-                return agentOnline;
+            get { return agentOnline; }
-            }
+            set { agentOnline = value; }
-            set {
-                agentOnline = value;
-            }
        }
-        public LLUUID SessionID {
+        public LLUUID SessionID
-            get {
+        {
-                return sessionID;
+            get { return sessionID; }
-            }
+            set { sessionID = value; }
-            set {
-                sessionID = value;
-            }
        }
-        public LLUUID SecureSessionID {
+        public LLUUID SecureSessionID
-            get {
+        {
-                return secureSessionID;
+            get { return secureSessionID; }
-            }
+            set { secureSessionID = value; }
-            set {
-                secureSessionID = value;
-            }
        }
-        public LLUUID InitialRegion {
+        public LLUUID InitialRegion
-            get {
+        {
-                return regionID;
+            get { return regionID; }
-            }
+            set { regionID = value; }
-            set {
-                regionID = value;
-            }
        }
-        public int LoginTime {
+        public int LoginTime
-            get {
+        {
-                return loginTime;
+            get { return loginTime; }
-            }
+            set { loginTime = value; }
-            set {
-                loginTime = value;
-            }
        }
-        public int LogoutTime {
+        public int LogoutTime
-            get {
+        {
-                return logoutTime;
+            get { return logoutTime; }
-            }
+            set { logoutTime = value; }
-            set {
-                logoutTime = value;
-            }
        }
-        public LLUUID Region {
+        public LLUUID Region
-            get {
+        {
-                return currentRegion;
+            get { return currentRegion; }
-            }
+            set { currentRegion = value; }
-            set {
-                currentRegion = value;
-            }
        }
-        public ulong Handle {
+        public ulong Handle
-            get {
+        {
-                return currentHandle;
+            get { return currentHandle; }
-            }
+            set { currentHandle = value; }
-            set {
-                currentHandle = value;
-            }
        }
-        public LLVector3 Position {
+        public LLVector3 Position
-            get {
+        {
-                return currentPos;
+            get { return currentPos; }
-            }
+            set { currentPos = value; }
-            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

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
36	public class UserAgentData	36	public class UserAgentData
37	{	37	{
38	/// <summary>	38	/// <summary>
39	/// The UUID of the users avatar (not the agent!)
40	/// </summary>
41	private LLUUID UUID;
42
43	/// <summary>
44	/// The IP address of the user	39	/// The IP address of the user
45	/// </summary>	40	/// </summary>
46	private string agentIP = String.Empty;	41	private string agentIP = String.Empty;
47		42
48	/// <summary>	43	/// <summary>
49	/// The port of the user	44	/// Is the user online?
50
51	/// </summary>	45	/// </summary>
52	private uint agentPort;	46	private bool agentOnline;
53		47
54	/// <summary>	48	/// <summary>
55	/// Is the user online?	49	/// The port of the user
56	/// </summary>	50	/// </summary>
57	private bool agentOnline;	51	private uint agentPort;
58		52
59	/// <summary>	53	/// <summary>
60	/// The session ID for the user (also the agent ID)	54	/// Region handle of the current region the user is in
61	/// </summary>	55	/// </summary>
62	private LLUUID sessionID;	56	private ulong currentHandle;
63		57
64	/// <summary>	58	/// <summary>
65	/// The "secure" session ID for the user	59	/// The position of the user within the region
66	/// </summary>	60	/// </summary>
67	/// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>	61	private LLVector3 currentPos;
68	private LLUUID secureSessionID;
69		62
70	/// <summary>	63	/// <summary>
71	/// The region the user logged into initially	64	/// Current region the user is logged into
72	/// </summary>	65	/// </summary>
73	private LLUUID regionID;	66	private LLUUID currentRegion;
74		67
75	/// <summary>	68	/// <summary>
76	/// A unix timestamp from when the user logged in	69	/// A unix timestamp from when the user logged in
@@ -83,139 +76,114 @@ namespace OpenSim.Framework
83	private int logoutTime;	76	private int logoutTime;
84		77
85	/// <summary>	78	/// <summary>
86	/// Current region the user is logged into	79	/// The region the user logged into initially
87	/// </summary>	80	/// </summary>
88	private LLUUID currentRegion;	81	private LLUUID regionID;
89		82
90	/// <summary>	83	/// <summary>
91	/// Region handle of the current region the user is in	84	/// The "secure" session ID for the user
92	/// </summary>	85	/// </summary>
93	private ulong currentHandle;	86	/// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
		87	private LLUUID secureSessionID;
94		88
95	/// <summary>	89	/// <summary>
96	/// The position of the user within the region	90	/// The session ID for the user (also the agent ID)
97	/// </summary>	91	/// </summary>
98	private LLVector3 currentPos;	92	private LLUUID sessionID;
99		93
100	public LLUUID ProfileID {	94	/// <summary>
101	get {	95	/// The UUID of the users avatar (not the agent!)
102	return UUID;	96	/// </summary>
103	}	97	private LLUUID UUID;
104	set {	98
105	UUID = value;	99	public LLUUID ProfileID
106	}	100	{
		101	get { return UUID; }
		102	set { UUID = value; }
107	}	103	}
108		104
109	public string AgentIP {	105	public string AgentIP
110	get {	106	{
111	return agentIP;	107	get { return agentIP; }
112	}	108	set { agentIP = value; }
113	set {
114	agentIP = value;
115	}
116	}	109	}
117		110
118	public uint AgentPort {	111	public uint AgentPort
119	get {	112	{
120	return agentPort;	113	get { return agentPort; }
121	}	114	set { agentPort = value; }
122	set {
123	agentPort = value;
124	}
125	}	115	}
126		116
127	public bool AgentOnline {	117	public bool AgentOnline
128	get {	118	{
129	return agentOnline;	119	get { return agentOnline; }
130	}	120	set { agentOnline = value; }
131	set {
132	agentOnline = value;
133	}
134	}	121	}
135		122
136	public LLUUID SessionID {	123	public LLUUID SessionID
137	get {	124	{
138	return sessionID;	125	get { return sessionID; }
139	}	126	set { sessionID = value; }
140	set {
141	sessionID = value;
142	}
143	}	127	}
144		128
145	public LLUUID SecureSessionID {	129	public LLUUID SecureSessionID
146	get {	130	{
147	return secureSessionID;	131	get { return secureSessionID; }
148	}	132	set { secureSessionID = value; }
149	set {
150	secureSessionID = value;
151	}
152	}	133	}
153		134
154	public LLUUID InitialRegion {	135	public LLUUID InitialRegion
155	get {	136	{
156	return regionID;	137	get { return regionID; }
157	}	138	set { regionID = value; }
158	set {
159	regionID = value;
160	}
161	}	139	}
162		140
163	public int LoginTime {	141	public int LoginTime
164	get {	142	{
165	return loginTime;	143	get { return loginTime; }
166	}	144	set { loginTime = value; }
167	set {
168	loginTime = value;
169	}
170	}	145	}
171		146
172	public int LogoutTime {	147	public int LogoutTime
173	get {	148	{
174	return logoutTime;	149	get { return logoutTime; }
175	}	150	set { logoutTime = value; }
176	set {
177	logoutTime = value;
178	}
179	}	151	}
180		152
181	public LLUUID Region {	153	public LLUUID Region
182	get {	154	{
183	return currentRegion;	155	get { return currentRegion; }
184	}	156	set { currentRegion = value; }
185	set {
186	currentRegion = value;
187	}
188	}	157	}
189		158
190	public ulong Handle {	159	public ulong Handle
191	get {	160	{
192	return currentHandle;	161	get { return currentHandle; }
193	}	162	set { currentHandle = value; }
194	set {
195	currentHandle = value;
196	}
197	}	163	}
198		164
199	public LLVector3 Position {	165	public LLVector3 Position
200	get {	166	{
201	return currentPos;	167	get { return currentPos; }
202	}	168	set { currentPos = value; }
203	set {
204	currentPos = value;
205	}
206	}	169	}
207		170
208	public float PositionX {	171	public float PositionX
		172	{
209	get { return currentPos.X; }	173	get { return currentPos.X; }
210	set { currentPos.X = value; }	174	set { currentPos.X = value; }
211	}	175	}
212	public float PositionY {	176
		177	public float PositionY
		178	{
213	get { return currentPos.Y; }	179	get { return currentPos.Y; }
214	set { currentPos.Y = value; }	180	set { currentPos.Y = value; }
215	}	181	}
216	public float PositionZ {	182
		183	public float PositionZ
		184	{
217	get { return currentPos.Z; }	185	get { return currentPos.Z; }
218	set { currentPos.Z = value; }	186	set { currentPos.Z = value; }
219	}	187	}
220	}	188	}
221	}	189	} \ No newline at end of file