diff options
author | lbsa71 | 2007-10-30 09:05:31 +0000 |
---|---|---|
committer | lbsa71 | 2007-10-30 09:05:31 +0000 |
commit | 67e12b95ea7b68f4904a7484d77ecfd787d16d0c (patch) | |
tree | 20b00d24c8a7617017960432ec044852e3ad5fa9 /OpenSim/Framework/General/UserProfileData.cs | |
parent | * Deleted .user file (diff) | |
download | opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2 opensim-SC_OLD-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz |
* Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
Diffstat (limited to 'OpenSim/Framework/General/UserProfileData.cs')
-rw-r--r-- | OpenSim/Framework/General/UserProfileData.cs | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/OpenSim/Framework/General/UserProfileData.cs b/OpenSim/Framework/General/UserProfileData.cs index 444d811..ed70246 100644 --- a/OpenSim/Framework/General/UserProfileData.cs +++ b/OpenSim/Framework/General/UserProfileData.cs | |||
@@ -44,6 +44,7 @@ namespace OpenSim.Framework | |||
44 | /// The first component of a users account name | 44 | /// The first component of a users account name |
45 | /// </summary> | 45 | /// </summary> |
46 | public string username; | 46 | public string username; |
47 | |||
47 | /// <summary> | 48 | /// <summary> |
48 | /// The second component of a users account name | 49 | /// The second component of a users account name |
49 | /// </summary> | 50 | /// </summary> |
@@ -54,6 +55,7 @@ namespace OpenSim.Framework | |||
54 | /// </summary> | 55 | /// </summary> |
55 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> | 56 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> |
56 | public string passwordHash; | 57 | public string passwordHash; |
58 | |||
57 | /// <summary> | 59 | /// <summary> |
58 | /// The salt used for the users hash, should be 32 bytes or longer | 60 | /// The salt used for the users hash, should be 32 bytes or longer |
59 | /// </summary> | 61 | /// </summary> |
@@ -64,18 +66,22 @@ namespace OpenSim.Framework | |||
64 | /// </summary> | 66 | /// </summary> |
65 | public ulong homeRegion | 67 | public ulong homeRegion |
66 | { | 68 | { |
67 | get { return Helpers.UIntsToLong((homeRegionX * 256), (homeRegionY * 256)); } | 69 | get { return Helpers.UIntsToLong((homeRegionX*256), (homeRegionY*256)); } |
68 | set { | 70 | set |
69 | homeRegionX = (uint)(value >> 40); | 71 | { |
70 | homeRegionY = (((uint)(value)) >> 8); | 72 | homeRegionX = (uint) (value >> 40); |
73 | homeRegionY = (((uint) (value)) >> 8); | ||
71 | } | 74 | } |
72 | } | 75 | } |
76 | |||
73 | public uint homeRegionX; | 77 | public uint homeRegionX; |
74 | public uint homeRegionY; | 78 | public uint homeRegionY; |
79 | |||
75 | /// <summary> | 80 | /// <summary> |
76 | /// The coordinates inside the region of the home location | 81 | /// The coordinates inside the region of the home location |
77 | /// </summary> | 82 | /// </summary> |
78 | public LLVector3 homeLocation; | 83 | public LLVector3 homeLocation; |
84 | |||
79 | /// <summary> | 85 | /// <summary> |
80 | /// Where the user will be looking when they rez. | 86 | /// Where the user will be looking when they rez. |
81 | /// </summary> | 87 | /// </summary> |
@@ -85,6 +91,7 @@ namespace OpenSim.Framework | |||
85 | /// A UNIX Timestamp (seconds since epoch) for the users creation | 91 | /// A UNIX Timestamp (seconds since epoch) for the users creation |
86 | /// </summary> | 92 | /// </summary> |
87 | public int created; | 93 | public int created; |
94 | |||
88 | /// <summary> | 95 | /// <summary> |
89 | /// A UNIX Timestamp for the users last login date / time | 96 | /// A UNIX Timestamp for the users last login date / time |
90 | /// </summary> | 97 | /// </summary> |
@@ -96,6 +103,7 @@ namespace OpenSim.Framework | |||
96 | /// A URI to the users inventory server, used for foreigners and large grids | 103 | /// A URI to the users inventory server, used for foreigners and large grids |
97 | /// </summary> | 104 | /// </summary> |
98 | public string userInventoryURI = String.Empty; | 105 | public string userInventoryURI = String.Empty; |
106 | |||
99 | /// <summary> | 107 | /// <summary> |
100 | /// A URI to the users asset server, used for foreigners and large grids. | 108 | /// A URI to the users asset server, used for foreigners and large grids. |
101 | /// </summary> | 109 | /// </summary> |
@@ -105,6 +113,7 @@ namespace OpenSim.Framework | |||
105 | /// A uint mask containing the "I can do" fields of the users profile | 113 | /// A uint mask containing the "I can do" fields of the users profile |
106 | /// </summary> | 114 | /// </summary> |
107 | public uint profileCanDoMask; | 115 | public uint profileCanDoMask; |
116 | |||
108 | /// <summary> | 117 | /// <summary> |
109 | /// A uint mask containing the "I want to do" part of the users profile | 118 | /// A uint mask containing the "I want to do" part of the users profile |
110 | /// </summary> | 119 | /// </summary> |
@@ -114,6 +123,7 @@ namespace OpenSim.Framework | |||
114 | /// The about text listed in a users profile. | 123 | /// The about text listed in a users profile. |
115 | /// </summary> | 124 | /// </summary> |
116 | public string profileAboutText = String.Empty; | 125 | public string profileAboutText = String.Empty; |
126 | |||
117 | /// <summary> | 127 | /// <summary> |
118 | /// The first life about text listed in a users profile | 128 | /// The first life about text listed in a users profile |
119 | /// </summary> | 129 | /// </summary> |
@@ -123,10 +133,12 @@ namespace OpenSim.Framework | |||
123 | /// The profile image for an avatar stored on the asset server | 133 | /// The profile image for an avatar stored on the asset server |
124 | /// </summary> | 134 | /// </summary> |
125 | public LLUUID profileImage; | 135 | public LLUUID profileImage; |
136 | |||
126 | /// <summary> | 137 | /// <summary> |
127 | /// The profile image for the users first life tab | 138 | /// The profile image for the users first life tab |
128 | /// </summary> | 139 | /// </summary> |
129 | public LLUUID profileFirstImage; | 140 | public LLUUID profileFirstImage; |
141 | |||
130 | /// <summary> | 142 | /// <summary> |
131 | /// The users last registered agent (filled in on the user server) | 143 | /// The users last registered agent (filled in on the user server) |
132 | /// </summary> | 144 | /// </summary> |
@@ -142,47 +154,58 @@ namespace OpenSim.Framework | |||
142 | /// The UUID of the users avatar (not the agent!) | 154 | /// The UUID of the users avatar (not the agent!) |
143 | /// </summary> | 155 | /// </summary> |
144 | public LLUUID UUID; | 156 | public LLUUID UUID; |
157 | |||
145 | /// <summary> | 158 | /// <summary> |
146 | /// The IP address of the user | 159 | /// The IP address of the user |
147 | /// </summary> | 160 | /// </summary> |
148 | public string agentIP = String.Empty; | 161 | public string agentIP = String.Empty; |
162 | |||
149 | /// <summary> | 163 | /// <summary> |
150 | /// The port of the user | 164 | /// The port of the user |
151 | /// </summary> | 165 | /// </summary> |
152 | public uint agentPort; | 166 | public uint agentPort; |
167 | |||
153 | /// <summary> | 168 | /// <summary> |
154 | /// Is the user online? | 169 | /// Is the user online? |
155 | /// </summary> | 170 | /// </summary> |
156 | public bool agentOnline; | 171 | public bool agentOnline; |
172 | |||
157 | /// <summary> | 173 | /// <summary> |
158 | /// The session ID for the user (also the agent ID) | 174 | /// The session ID for the user (also the agent ID) |
159 | /// </summary> | 175 | /// </summary> |
160 | public LLUUID sessionID; | 176 | public LLUUID sessionID; |
177 | |||
161 | /// <summary> | 178 | /// <summary> |
162 | /// The "secure" session ID for the user | 179 | /// The "secure" session ID for the user |
163 | /// </summary> | 180 | /// </summary> |
164 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> | 181 | /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> |
165 | public LLUUID secureSessionID; | 182 | public LLUUID secureSessionID; |
183 | |||
166 | /// <summary> | 184 | /// <summary> |
167 | /// The region the user logged into initially | 185 | /// The region the user logged into initially |
168 | /// </summary> | 186 | /// </summary> |
169 | public LLUUID regionID; | 187 | public LLUUID regionID; |
188 | |||
170 | /// <summary> | 189 | /// <summary> |
171 | /// A unix timestamp from when the user logged in | 190 | /// A unix timestamp from when the user logged in |
172 | /// </summary> | 191 | /// </summary> |
173 | public int loginTime; | 192 | public int loginTime; |
193 | |||
174 | /// <summary> | 194 | /// <summary> |
175 | /// When this agent expired and logged out, 0 if still online | 195 | /// When this agent expired and logged out, 0 if still online |
176 | /// </summary> | 196 | /// </summary> |
177 | public int logoutTime; | 197 | public int logoutTime; |
198 | |||
178 | /// <summary> | 199 | /// <summary> |
179 | /// Current region the user is logged into | 200 | /// Current region the user is logged into |
180 | /// </summary> | 201 | /// </summary> |
181 | public LLUUID currentRegion; | 202 | public LLUUID currentRegion; |
203 | |||
182 | /// <summary> | 204 | /// <summary> |
183 | /// Region handle of the current region the user is in | 205 | /// Region handle of the current region the user is in |
184 | /// </summary> | 206 | /// </summary> |
185 | public ulong currentHandle; | 207 | public ulong currentHandle; |
208 | |||
186 | /// <summary> | 209 | /// <summary> |
187 | /// The position of the user within the region | 210 | /// The position of the user within the region |
188 | /// </summary> | 211 | /// </summary> |