aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712009-04-13 20:05:12 +0000
committerlbsa712009-04-13 20:05:12 +0000
commita7ed7665a6bfa6852980e3e3111b79518fc0d690 (patch)
tree19503590af0c8e9c91e609de0d7a42dc4a7549a0 /OpenSim
parent* Some more experimental work on distributed assets. Nothing hotwired yet. (diff)
downloadopensim-SC-a7ed7665a6bfa6852980e3e3111b79518fc0d690.zip
opensim-SC-a7ed7665a6bfa6852980e3e3111b79518fc0d690.tar.gz
opensim-SC-a7ed7665a6bfa6852980e3e3111b79518fc0d690.tar.bz2
opensim-SC-a7ed7665a6bfa6852980e3e3111b79518fc0d690.tar.xz
* Changed all privates to m_ scheme
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/UserProfileData.cs200
1 files changed, 100 insertions, 100 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 51678e4..0ddf5ab 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -38,116 +38,116 @@ namespace OpenSim.Framework
38 /// <summary> 38 /// <summary>
39 /// A UNIX Timestamp (seconds since epoch) for the users creation 39 /// A UNIX Timestamp (seconds since epoch) for the users creation
40 /// </summary> 40 /// </summary>
41 private int _created; 41 private int m_created;
42 42
43 /// <summary> 43 /// <summary>
44 /// The users last registered agent (filled in on the user server) 44 /// The users last registered agent (filled in on the user server)
45 /// </summary> 45 /// </summary>
46 private UserAgentData _currentAgent; 46 private UserAgentData m_currentAgent;
47 47
48 /// <summary> 48 /// <summary>
49 /// The first component of a users account name 49 /// The first component of a users account name
50 /// </summary> 50 /// </summary>
51 private string _firstname; 51 private string m_firstname;
52 52
53 /// <summary> 53 /// <summary>
54 /// The coordinates inside the region of the home location 54 /// The coordinates inside the region of the home location
55 /// </summary> 55 /// </summary>
56 private Vector3 _homeLocation; 56 private Vector3 m_homeLocation;
57 57
58 /// <summary> 58 /// <summary>
59 /// Where the user will be looking when they rez. 59 /// Where the user will be looking when they rez.
60 /// </summary> 60 /// </summary>
61 private Vector3 _homeLookAt; 61 private Vector3 m_homeLookAt;
62 62
63 private uint _homeRegionX; 63 private uint m_homeRegionX;
64 private uint _homeRegionY; 64 private uint m_homeRegionY;
65 65
66 /// <summary> 66 /// <summary>
67 /// The ID value for this user 67 /// The ID value for this user
68 /// </summary> 68 /// </summary>
69 private UUID _id; 69 private UUID m_id;
70 70
71 /// <summary> 71 /// <summary>
72 /// A UNIX Timestamp for the users last login date / time 72 /// A UNIX Timestamp for the users last login date / time
73 /// </summary> 73 /// </summary>
74 private int _lastLogin; 74 private int m_lastLogin;
75 75
76 /// <summary> 76 /// <summary>
77 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt) 77 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
78 /// </summary> 78 /// </summary>
79 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> 79 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
80 private string _passwordHash; 80 private string m_passwordHash;
81 81
82 /// <summary> 82 /// <summary>
83 /// The salt used for the users hash, should be 32 bytes or longer 83 /// The salt used for the users hash, should be 32 bytes or longer
84 /// </summary> 84 /// </summary>
85 private string _passwordSalt; 85 private string m_passwordSalt;
86 86
87 /// <summary> 87 /// <summary>
88 /// The about text listed in a users profile. 88 /// The about text listed in a users profile.
89 /// </summary> 89 /// </summary>
90 private string _profileAboutText = String.Empty; 90 private string m_profileAboutText = String.Empty;
91 91
92 /// <summary> 92 /// <summary>
93 /// A uint mask containing the "I can do" fields of the users profile 93 /// A uint mask containing the "I can do" fields of the users profile
94 /// </summary> 94 /// </summary>
95 private uint _profileCanDoMask; 95 private uint m_profileCanDoMask;
96 96
97 /// <summary> 97 /// <summary>
98 /// The profile image for the users first life tab 98 /// The profile image for the users first life tab
99 /// </summary> 99 /// </summary>
100 private UUID _profileFirstImage; 100 private UUID m_profileFirstImage;
101 101
102 /// <summary> 102 /// <summary>
103 /// The first life about text listed in a users profile 103 /// The first life about text listed in a users profile
104 /// </summary> 104 /// </summary>
105 private string _profileFirstText = String.Empty; 105 private string m_profileFirstText = String.Empty;
106 106
107 /// <summary> 107 /// <summary>
108 /// The profile image for an avatar stored on the asset server 108 /// The profile image for an avatar stored on the asset server
109 /// </summary> 109 /// </summary>
110 private UUID _profileImage; 110 private UUID m_profileImage;
111 111
112 /// <summary> 112 /// <summary>
113 /// A uint mask containing the "I want to do" part of the users profile 113 /// A uint mask containing the "I want to do" part of the users profile
114 /// </summary> 114 /// </summary>
115 private uint _profileWantDoMask; // Profile window "I want to" mask 115 private uint m_profileWantDoMask; // Profile window "I want to" mask
116 116
117 private UUID _rootInventoryFolderID; 117 private UUID m_rootInventoryFolderId;
118 118
119 /// <summary> 119 /// <summary>
120 /// The second component of a users account name 120 /// The second component of a users account name
121 /// </summary> 121 /// </summary>
122 private string _surname; 122 private string m_surname;
123 123
124 /// <summary> 124 /// <summary>
125 /// A valid email address for the account. Useful for password reset requests. 125 /// A valid email address for the account. Useful for password reset requests.
126 /// </summary> 126 /// </summary>
127 private string _email = String.Empty; 127 private string m_email = String.Empty;
128 128
129 /// <summary> 129 /// <summary>
130 /// A URI to the users asset server, used for foreigners and large grids. 130 /// A URI to the users asset server, used for foreigners and large grids.
131 /// </summary> 131 /// </summary>
132 private string _userAssetURI = String.Empty; 132 private string m_userAssetUri = String.Empty;
133 133
134 /// <summary> 134 /// <summary>
135 /// A URI to the users inventory server, used for foreigners and large grids 135 /// A URI to the users inventory server, used for foreigners and large grids
136 /// </summary> 136 /// </summary>
137 private string _userInventoryURI = String.Empty; 137 private string m_userInventoryUri = String.Empty;
138 138
139 /// <summary> 139 /// <summary>
140 /// The last used Web_login_key 140 /// The last used Web_login_key
141 /// </summary> 141 /// </summary>
142 private UUID _webLoginKey; 142 private UUID m_webLoginKey;
143 143
144 // Data for estates and other goodies 144 // Data for estates and other goodies
145 // to get away from per-machine configs a little 145 // to get away from per-machine configs a little
146 // 146 //
147 private int _userFlags; 147 private int m_userFlags;
148 private int _godLevel; 148 private int m_godLevel;
149 private string _customType; 149 private string m_customType;
150 private UUID _partner; 150 private UUID m_partner;
151 151
152 /// <summary> 152 /// <summary>
153 /// The regionhandle of the users preferred home region. If 153 /// The regionhandle of the users preferred home region. If
@@ -156,15 +156,15 @@ namespace OpenSim.Framework
156 /// </summary> 156 /// </summary>
157 public virtual ulong HomeRegion 157 public virtual ulong HomeRegion
158 { 158 {
159 get { return Utils.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); } 159 get { return Utils.UIntsToLong((m_homeRegionX * (uint)Constants.RegionSize), (m_homeRegionY * (uint)Constants.RegionSize)); }
160 set 160 set
161 { 161 {
162 _homeRegionX = (uint) (value >> 40); 162 m_homeRegionX = (uint) (value >> 40);
163 _homeRegionY = (((uint) (value)) >> 8); 163 m_homeRegionY = (((uint) (value)) >> 8);
164 } 164 }
165 } 165 }
166 166
167 private UUID _homeRegionID; 167 private UUID m_homeRegionId;
168 /// <summary> 168 /// <summary>
169 /// The regionID of the users home region. This is unique; 169 /// The regionID of the users home region. This is unique;
170 /// even if the position of the region changes within the 170 /// even if the position of the region changes within the
@@ -172,33 +172,33 @@ namespace OpenSim.Framework
172 /// </summary> 172 /// </summary>
173 public UUID HomeRegionID 173 public UUID HomeRegionID
174 { 174 {
175 get { return _homeRegionID; } 175 get { return m_homeRegionId; }
176 set { _homeRegionID = value; } 176 set { m_homeRegionId = value; }
177 } 177 }
178 178
179 // Property wrappers 179 // Property wrappers
180 public UUID ID 180 public UUID ID
181 { 181 {
182 get { return _id; } 182 get { return m_id; }
183 set { _id = value; } 183 set { m_id = value; }
184 } 184 }
185 185
186 public UUID WebLoginKey 186 public UUID WebLoginKey
187 { 187 {
188 get { return _webLoginKey; } 188 get { return m_webLoginKey; }
189 set { _webLoginKey = value; } 189 set { m_webLoginKey = value; }
190 } 190 }
191 191
192 public string FirstName 192 public string FirstName
193 { 193 {
194 get { return _firstname; } 194 get { return m_firstname; }
195 set { _firstname = value; } 195 set { m_firstname = value; }
196 } 196 }
197 197
198 public string SurName 198 public string SurName
199 { 199 {
200 get { return _surname; } 200 get { return m_surname; }
201 set { _surname = value; } 201 set { m_surname = value; }
202 } 202 }
203 203
204 /// <value> 204 /// <value>
@@ -206,184 +206,184 @@ namespace OpenSim.Framework
206 /// </value> 206 /// </value>
207 public string Name 207 public string Name
208 { 208 {
209 get { return String.Format("{0} {1}", _firstname, _surname); } 209 get { return String.Format("{0} {1}", m_firstname, m_surname); }
210 } 210 }
211 211
212 public string Email 212 public string Email
213 { 213 {
214 get { return _email; } 214 get { return m_email; }
215 set { _email = value; } 215 set { m_email = value; }
216 } 216 }
217 217
218 public string PasswordHash 218 public string PasswordHash
219 { 219 {
220 get { return _passwordHash; } 220 get { return m_passwordHash; }
221 set { _passwordHash = value; } 221 set { m_passwordHash = value; }
222 } 222 }
223 223
224 public string PasswordSalt 224 public string PasswordSalt
225 { 225 {
226 get { return _passwordSalt; } 226 get { return m_passwordSalt; }
227 set { _passwordSalt = value; } 227 set { m_passwordSalt = value; }
228 } 228 }
229 229
230 public uint HomeRegionX 230 public uint HomeRegionX
231 { 231 {
232 get { return _homeRegionX; } 232 get { return m_homeRegionX; }
233 set { _homeRegionX = value; } 233 set { m_homeRegionX = value; }
234 } 234 }
235 235
236 public uint HomeRegionY 236 public uint HomeRegionY
237 { 237 {
238 get { return _homeRegionY; } 238 get { return m_homeRegionY; }
239 set { _homeRegionY = value; } 239 set { m_homeRegionY = value; }
240 } 240 }
241 241
242 public Vector3 HomeLocation 242 public Vector3 HomeLocation
243 { 243 {
244 get { return _homeLocation; } 244 get { return m_homeLocation; }
245 set { _homeLocation = value; } 245 set { m_homeLocation = value; }
246 } 246 }
247 247
248 // for handy serialization 248 // for handy serialization
249 public float HomeLocationX 249 public float HomeLocationX
250 { 250 {
251 get { return _homeLocation.X; } 251 get { return m_homeLocation.X; }
252 set { _homeLocation.X = value; } 252 set { m_homeLocation.X = value; }
253 } 253 }
254 254
255 public float HomeLocationY 255 public float HomeLocationY
256 { 256 {
257 get { return _homeLocation.Y; } 257 get { return m_homeLocation.Y; }
258 set { _homeLocation.Y = value; } 258 set { m_homeLocation.Y = value; }
259 } 259 }
260 260
261 public float HomeLocationZ 261 public float HomeLocationZ
262 { 262 {
263 get { return _homeLocation.Z; } 263 get { return m_homeLocation.Z; }
264 set { _homeLocation.Z = value; } 264 set { m_homeLocation.Z = value; }
265 } 265 }
266 266
267 267
268 public Vector3 HomeLookAt 268 public Vector3 HomeLookAt
269 { 269 {
270 get { return _homeLookAt; } 270 get { return m_homeLookAt; }
271 set { _homeLookAt = value; } 271 set { m_homeLookAt = value; }
272 } 272 }
273 273
274 // for handy serialization 274 // for handy serialization
275 public float HomeLookAtX 275 public float HomeLookAtX
276 { 276 {
277 get { return _homeLookAt.X; } 277 get { return m_homeLookAt.X; }
278 set { _homeLookAt.X = value; } 278 set { m_homeLookAt.X = value; }
279 } 279 }
280 280
281 public float HomeLookAtY 281 public float HomeLookAtY
282 { 282 {
283 get { return _homeLookAt.Y; } 283 get { return m_homeLookAt.Y; }
284 set { _homeLookAt.Y = value; } 284 set { m_homeLookAt.Y = value; }
285 } 285 }
286 286
287 public float HomeLookAtZ 287 public float HomeLookAtZ
288 { 288 {
289 get { return _homeLookAt.Z; } 289 get { return m_homeLookAt.Z; }
290 set { _homeLookAt.Z = value; } 290 set { m_homeLookAt.Z = value; }
291 } 291 }
292 292
293 public int Created 293 public int Created
294 { 294 {
295 get { return _created; } 295 get { return m_created; }
296 set { _created = value; } 296 set { m_created = value; }
297 } 297 }
298 298
299 public int LastLogin 299 public int LastLogin
300 { 300 {
301 get { return _lastLogin; } 301 get { return m_lastLogin; }
302 set { _lastLogin = value; } 302 set { m_lastLogin = value; }
303 } 303 }
304 304
305 public UUID RootInventoryFolderID 305 public UUID RootInventoryFolderID
306 { 306 {
307 get { return _rootInventoryFolderID; } 307 get { return m_rootInventoryFolderId; }
308 set { _rootInventoryFolderID = value; } 308 set { m_rootInventoryFolderId = value; }
309 } 309 }
310 310
311 public string UserInventoryURI 311 public string UserInventoryURI
312 { 312 {
313 get { return _userInventoryURI; } 313 get { return m_userInventoryUri; }
314 set { _userInventoryURI = value; } 314 set { m_userInventoryUri = value; }
315 } 315 }
316 316
317 public string UserAssetURI 317 public string UserAssetURI
318 { 318 {
319 get { return _userAssetURI; } 319 get { return m_userAssetUri; }
320 set { _userAssetURI = value; } 320 set { m_userAssetUri = value; }
321 } 321 }
322 322
323 public uint CanDoMask 323 public uint CanDoMask
324 { 324 {
325 get { return _profileCanDoMask; } 325 get { return m_profileCanDoMask; }
326 set { _profileCanDoMask = value; } 326 set { m_profileCanDoMask = value; }
327 } 327 }
328 328
329 public uint WantDoMask 329 public uint WantDoMask
330 { 330 {
331 get { return _profileWantDoMask; } 331 get { return m_profileWantDoMask; }
332 set { _profileWantDoMask = value; } 332 set { m_profileWantDoMask = value; }
333 } 333 }
334 334
335 public string AboutText 335 public string AboutText
336 { 336 {
337 get { return _profileAboutText; } 337 get { return m_profileAboutText; }
338 set { _profileAboutText = value; } 338 set { m_profileAboutText = value; }
339 } 339 }
340 340
341 public string FirstLifeAboutText 341 public string FirstLifeAboutText
342 { 342 {
343 get { return _profileFirstText; } 343 get { return m_profileFirstText; }
344 set { _profileFirstText = value; } 344 set { m_profileFirstText = value; }
345 } 345 }
346 346
347 public UUID Image 347 public UUID Image
348 { 348 {
349 get { return _profileImage; } 349 get { return m_profileImage; }
350 set { _profileImage = value; } 350 set { m_profileImage = value; }
351 } 351 }
352 352
353 public UUID FirstLifeImage 353 public UUID FirstLifeImage
354 { 354 {
355 get { return _profileFirstImage; } 355 get { return m_profileFirstImage; }
356 set { _profileFirstImage = value; } 356 set { m_profileFirstImage = value; }
357 } 357 }
358 358
359 public UserAgentData CurrentAgent 359 public UserAgentData CurrentAgent
360 { 360 {
361 get { return _currentAgent; } 361 get { return m_currentAgent; }
362 set { _currentAgent = value; } 362 set { m_currentAgent = value; }
363 } 363 }
364 364
365 public int UserFlags 365 public int UserFlags
366 { 366 {
367 get { return _userFlags; } 367 get { return m_userFlags; }
368 set { _userFlags = value; } 368 set { m_userFlags = value; }
369 } 369 }
370 370
371 public int GodLevel 371 public int GodLevel
372 { 372 {
373 get { return _godLevel; } 373 get { return m_godLevel; }
374 set { _godLevel = value; } 374 set { m_godLevel = value; }
375 } 375 }
376 376
377 public string CustomType 377 public string CustomType
378 { 378 {
379 get { return _customType; } 379 get { return m_customType; }
380 set { _customType = value; } 380 set { m_customType = value; }
381 } 381 }
382 382
383 public UUID Partner 383 public UUID Partner
384 { 384 {
385 get { return _partner; } 385 get { return m_partner; }
386 set { _partner = value; } 386 set { m_partner = value; }
387 } 387 }
388 } 388 }
389} 389}