diff options
author | Sean Dague | 2008-04-10 14:09:30 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-10 14:09:30 +0000 |
commit | 25fea01b92a7682e10f57ce979217d31fee975ef (patch) | |
tree | 0e0dec2344cd06609bf47f1a7e2245a0a94f99c6 /OpenSim/Framework/UserProfileData.cs | |
parent | moved fields to properties for UserDataProfile, which was (diff) | |
download | opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.zip opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.gz opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.bz2 opensim-SC_OLD-25fea01b92a7682e10f57ce979217d31fee975ef.tar.xz |
further renaming of properties for clarity
Diffstat (limited to 'OpenSim/Framework/UserProfileData.cs')
-rw-r--r-- | OpenSim/Framework/UserProfileData.cs | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs index 016dc8d..73c9137 100644 --- a/OpenSim/Framework/UserProfileData.cs +++ b/OpenSim/Framework/UserProfileData.cs | |||
@@ -43,42 +43,42 @@ namespace OpenSim.Framework | |||
43 | /// <summary> | 43 | /// <summary> |
44 | /// The last used Web_login_key | 44 | /// The last used Web_login_key |
45 | /// </summary> | 45 | /// </summary> |
46 | private LLUUID webLoginKey; | 46 | private LLUUID _webLoginKey; |
47 | /// <summary> | 47 | /// <summary> |
48 | /// The first component of a users account name | 48 | /// The first component of a users account name |
49 | /// </summary> | 49 | /// </summary> |
50 | private string username; | 50 | private string _firstname; |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
53 | /// The second component of a users account name | 53 | /// The second component of a users account name |
54 | /// </summary> | 54 | /// </summary> |
55 | private string surname; | 55 | private string _surname; |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) | 58 | /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) |
59 | /// </summary> | 59 | /// </summary> |
60 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> | 60 | /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> |
61 | private string passwordHash; | 61 | private string _passwordHash; |
62 | 62 | ||
63 | /// <summary> | 63 | /// <summary> |
64 | /// The salt used for the users hash, should be 32 bytes or longer | 64 | /// The salt used for the users hash, should be 32 bytes or longer |
65 | /// </summary> | 65 | /// </summary> |
66 | private string passwordSalt; | 66 | private string _passwordSalt; |
67 | 67 | ||
68 | /// <summary> | 68 | /// <summary> |
69 | /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into | 69 | /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into |
70 | /// </summary> | 70 | /// </summary> |
71 | public ulong HomeRegion | 71 | public ulong HomeRegion |
72 | { | 72 | { |
73 | get { return Helpers.UIntsToLong((homeRegionX * (uint)Constants.RegionSize), (homeRegionY * (uint)Constants.RegionSize)); } | 73 | get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); } |
74 | set | 74 | set |
75 | { | 75 | { |
76 | homeRegionX = (uint) (value >> 40); | 76 | _homeRegionX = (uint) (value >> 40); |
77 | homeRegionY = (((uint) (value)) >> 8); | 77 | _homeRegionY = (((uint) (value)) >> 8); |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | public LLUUID Id { | 81 | public LLUUID ID { |
82 | get { | 82 | get { |
83 | return _id; | 83 | return _id; |
84 | } | 84 | } |
@@ -89,261 +89,261 @@ namespace OpenSim.Framework | |||
89 | 89 | ||
90 | public LLUUID WebLoginKey { | 90 | public LLUUID WebLoginKey { |
91 | get { | 91 | get { |
92 | return webLoginKey; | 92 | return _webLoginKey; |
93 | } | 93 | } |
94 | set { | 94 | set { |
95 | webLoginKey = value; | 95 | _webLoginKey = value; |
96 | } | 96 | } |
97 | } | 97 | } |
98 | 98 | ||
99 | public string FirstName { | 99 | public string FirstName { |
100 | get { | 100 | get { |
101 | return username; | 101 | return _firstname; |
102 | } | 102 | } |
103 | set { | 103 | set { |
104 | username = value; | 104 | _firstname = value; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
108 | public string SurName { | 108 | public string SurName { |
109 | get { | 109 | get { |
110 | return surname; | 110 | return _surname; |
111 | } | 111 | } |
112 | set { | 112 | set { |
113 | surname = value; | 113 | _surname = value; |
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | public string PasswordHash { | 117 | public string PasswordHash { |
118 | get { | 118 | get { |
119 | return passwordHash; | 119 | return _passwordHash; |
120 | } | 120 | } |
121 | set { | 121 | set { |
122 | passwordHash = value; | 122 | _passwordHash = value; |
123 | } | 123 | } |
124 | } | 124 | } |
125 | 125 | ||
126 | public string PasswordSalt { | 126 | public string PasswordSalt { |
127 | get { | 127 | get { |
128 | return passwordSalt; | 128 | return _passwordSalt; |
129 | } | 129 | } |
130 | set { | 130 | set { |
131 | passwordSalt = value; | 131 | _passwordSalt = value; |
132 | } | 132 | } |
133 | } | 133 | } |
134 | 134 | ||
135 | public uint HomeRegionX { | 135 | public uint HomeRegionX { |
136 | get { | 136 | get { |
137 | return homeRegionX; | 137 | return _homeRegionX; |
138 | } | 138 | } |
139 | set { | 139 | set { |
140 | homeRegionX = value; | 140 | _homeRegionX = value; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | public uint HomeRegionY { | 144 | public uint HomeRegionY { |
145 | get { | 145 | get { |
146 | return homeRegionY; | 146 | return _homeRegionY; |
147 | } | 147 | } |
148 | set { | 148 | set { |
149 | homeRegionY = value; | 149 | _homeRegionY = value; |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | public LLVector3 HomeLocation { | 153 | public LLVector3 HomeLocation { |
154 | get { | 154 | get { |
155 | return homeLocation; | 155 | return _homeLocation; |
156 | } | 156 | } |
157 | set { | 157 | set { |
158 | homeLocation = value; | 158 | _homeLocation = value; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | 161 | ||
162 | public LLVector3 HomeLookAt { | 162 | public LLVector3 HomeLookAt { |
163 | get { | 163 | get { |
164 | return homeLookAt; | 164 | return _homeLookAt; |
165 | } | 165 | } |
166 | set { | 166 | set { |
167 | homeLookAt = value; | 167 | _homeLookAt = value; |
168 | } | 168 | } |
169 | } | 169 | } |
170 | 170 | ||
171 | public int Created { | 171 | public int Created { |
172 | get { | 172 | get { |
173 | return created; | 173 | return _created; |
174 | } | 174 | } |
175 | set { | 175 | set { |
176 | created = value; | 176 | _created = value; |
177 | } | 177 | } |
178 | } | 178 | } |
179 | 179 | ||
180 | public int LastLogin { | 180 | public int LastLogin { |
181 | get { | 181 | get { |
182 | return lastLogin; | 182 | return _lastLogin; |
183 | } | 183 | } |
184 | set { | 184 | set { |
185 | lastLogin = value; | 185 | _lastLogin = value; |
186 | } | 186 | } |
187 | } | 187 | } |
188 | 188 | ||
189 | public LLUUID RootInventoryFolderID { | 189 | public LLUUID RootInventoryFolderID { |
190 | get { | 190 | get { |
191 | return rootInventoryFolderID; | 191 | return _rootInventoryFolderID; |
192 | } | 192 | } |
193 | set { | 193 | set { |
194 | rootInventoryFolderID = value; | 194 | _rootInventoryFolderID = value; |
195 | } | 195 | } |
196 | } | 196 | } |
197 | 197 | ||
198 | public string UserInventoryURI { | 198 | public string UserInventoryURI { |
199 | get { | 199 | get { |
200 | return userInventoryURI; | 200 | return _userInventoryURI; |
201 | } | 201 | } |
202 | set { | 202 | set { |
203 | userInventoryURI = value; | 203 | _userInventoryURI = value; |
204 | } | 204 | } |
205 | } | 205 | } |
206 | 206 | ||
207 | public string UserAssetURI { | 207 | public string UserAssetURI { |
208 | get { | 208 | get { |
209 | return userAssetURI; | 209 | return _userAssetURI; |
210 | } | 210 | } |
211 | set { | 211 | set { |
212 | userAssetURI = value; | 212 | _userAssetURI = value; |
213 | } | 213 | } |
214 | } | 214 | } |
215 | 215 | ||
216 | public uint ProfileCanDoMask { | 216 | public uint CanDoMask { |
217 | get { | 217 | get { |
218 | return profileCanDoMask; | 218 | return _profileCanDoMask; |
219 | } | 219 | } |
220 | set { | 220 | set { |
221 | profileCanDoMask = value; | 221 | _profileCanDoMask = value; |
222 | } | 222 | } |
223 | } | 223 | } |
224 | 224 | ||
225 | public uint ProfileWantDoMask { | 225 | public uint WantDoMask { |
226 | get { | 226 | get { |
227 | return profileWantDoMask; | 227 | return _profileWantDoMask; |
228 | } | 228 | } |
229 | set { | 229 | set { |
230 | profileWantDoMask = value; | 230 | _profileWantDoMask = value; |
231 | } | 231 | } |
232 | } | 232 | } |
233 | 233 | ||
234 | public string ProfileAboutText { | 234 | public string AboutText { |
235 | get { | 235 | get { |
236 | return profileAboutText; | 236 | return _profileAboutText; |
237 | } | 237 | } |
238 | set { | 238 | set { |
239 | profileAboutText = value; | 239 | _profileAboutText = value; |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | public string ProfileFirstText { | 243 | public string FirstLifeAboutText { |
244 | get { | 244 | get { |
245 | return profileFirstText; | 245 | return _profileFirstText; |
246 | } | 246 | } |
247 | set { | 247 | set { |
248 | profileFirstText = value; | 248 | _profileFirstText = value; |
249 | } | 249 | } |
250 | } | 250 | } |
251 | 251 | ||
252 | public LLUUID ProfileImage { | 252 | public LLUUID Image { |
253 | get { | 253 | get { |
254 | return profileImage; | 254 | return _profileImage; |
255 | } | 255 | } |
256 | set { | 256 | set { |
257 | profileImage = value; | 257 | _profileImage = value; |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | public LLUUID ProfileFirstImage { | 261 | public LLUUID FirstLifeImage { |
262 | get { | 262 | get { |
263 | return profileFirstImage; | 263 | return _profileFirstImage; |
264 | } | 264 | } |
265 | set { | 265 | set { |
266 | profileFirstImage = value; | 266 | _profileFirstImage = value; |
267 | } | 267 | } |
268 | } | 268 | } |
269 | 269 | ||
270 | public UserAgentData CurrentAgent { | 270 | public UserAgentData CurrentAgent { |
271 | get { | 271 | get { |
272 | return currentAgent; | 272 | return _currentAgent; |
273 | } | 273 | } |
274 | set { | 274 | set { |
275 | currentAgent = value; | 275 | _currentAgent = value; |
276 | } | 276 | } |
277 | } | 277 | } |
278 | 278 | ||
279 | private uint homeRegionX; | 279 | private uint _homeRegionX; |
280 | private uint homeRegionY; | 280 | private uint _homeRegionY; |
281 | 281 | ||
282 | /// <summary> | 282 | /// <summary> |
283 | /// The coordinates inside the region of the home location | 283 | /// The coordinates inside the region of the home location |
284 | /// </summary> | 284 | /// </summary> |
285 | private LLVector3 homeLocation; | 285 | private LLVector3 _homeLocation; |
286 | 286 | ||
287 | /// <summary> | 287 | /// <summary> |
288 | /// Where the user will be looking when they rez. | 288 | /// Where the user will be looking when they rez. |
289 | /// </summary> | 289 | /// </summary> |
290 | private LLVector3 homeLookAt; | 290 | private LLVector3 _homeLookAt; |
291 | 291 | ||
292 | /// <summary> | 292 | /// <summary> |
293 | /// A UNIX Timestamp (seconds since epoch) for the users creation | 293 | /// A UNIX Timestamp (seconds since epoch) for the users creation |
294 | /// </summary> | 294 | /// </summary> |
295 | private int created; | 295 | private int _created; |
296 | 296 | ||
297 | /// <summary> | 297 | /// <summary> |
298 | /// A UNIX Timestamp for the users last login date / time | 298 | /// A UNIX Timestamp for the users last login date / time |
299 | /// </summary> | 299 | /// </summary> |
300 | private int lastLogin; | 300 | private int _lastLogin; |
301 | 301 | ||
302 | private LLUUID rootInventoryFolderID; | 302 | private LLUUID _rootInventoryFolderID; |
303 | 303 | ||
304 | /// <summary> | 304 | /// <summary> |
305 | /// A URI to the users inventory server, used for foreigners and large grids | 305 | /// A URI to the users inventory server, used for foreigners and large grids |
306 | /// </summary> | 306 | /// </summary> |
307 | private string userInventoryURI = String.Empty; | 307 | private string _userInventoryURI = String.Empty; |
308 | 308 | ||
309 | /// <summary> | 309 | /// <summary> |
310 | /// A URI to the users asset server, used for foreigners and large grids. | 310 | /// A URI to the users asset server, used for foreigners and large grids. |
311 | /// </summary> | 311 | /// </summary> |
312 | private string userAssetURI = String.Empty; | 312 | private string _userAssetURI = String.Empty; |
313 | 313 | ||
314 | /// <summary> | 314 | /// <summary> |
315 | /// A uint mask containing the "I can do" fields of the users profile | 315 | /// A uint mask containing the "I can do" fields of the users profile |
316 | /// </summary> | 316 | /// </summary> |
317 | private uint profileCanDoMask; | 317 | private uint _profileCanDoMask; |
318 | 318 | ||
319 | /// <summary> | 319 | /// <summary> |
320 | /// A uint mask containing the "I want to do" part of the users profile | 320 | /// A uint mask containing the "I want to do" part of the users profile |
321 | /// </summary> | 321 | /// </summary> |
322 | private uint profileWantDoMask; // Profile window "I want to" mask | 322 | private uint _profileWantDoMask; // Profile window "I want to" mask |
323 | 323 | ||
324 | /// <summary> | 324 | /// <summary> |
325 | /// The about text listed in a users profile. | 325 | /// The about text listed in a users profile. |
326 | /// </summary> | 326 | /// </summary> |
327 | private string profileAboutText = String.Empty; | 327 | private string _profileAboutText = String.Empty; |
328 | 328 | ||
329 | /// <summary> | 329 | /// <summary> |
330 | /// The first life about text listed in a users profile | 330 | /// The first life about text listed in a users profile |
331 | /// </summary> | 331 | /// </summary> |
332 | private string profileFirstText = String.Empty; | 332 | private string _profileFirstText = String.Empty; |
333 | 333 | ||
334 | /// <summary> | 334 | /// <summary> |
335 | /// The profile image for an avatar stored on the asset server | 335 | /// The profile image for an avatar stored on the asset server |
336 | /// </summary> | 336 | /// </summary> |
337 | private LLUUID profileImage; | 337 | private LLUUID _profileImage; |
338 | 338 | ||
339 | /// <summary> | 339 | /// <summary> |
340 | /// The profile image for the users first life tab | 340 | /// The profile image for the users first life tab |
341 | /// </summary> | 341 | /// </summary> |
342 | private LLUUID profileFirstImage; | 342 | private LLUUID _profileFirstImage; |
343 | 343 | ||
344 | /// <summary> | 344 | /// <summary> |
345 | /// The users last registered agent (filled in on the user server) | 345 | /// The users last registered agent (filled in on the user server) |
346 | /// </summary> | 346 | /// </summary> |
347 | private UserAgentData currentAgent; | 347 | private UserAgentData _currentAgent; |
348 | } | 348 | } |
349 | } | 349 | } |