diff options
Diffstat (limited to 'OpenSim/Framework/UserProfileData.cs')
-rw-r--r-- | OpenSim/Framework/UserProfileData.cs | 244 |
1 files changed, 221 insertions, 23 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs index 6a49f0d..016dc8d 100644 --- a/OpenSim/Framework/UserProfileData.cs +++ b/OpenSim/Framework/UserProfileData.cs | |||
@@ -38,37 +38,37 @@ namespace OpenSim.Framework | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// The ID value for this user | 39 | /// The ID value for this user |
40 | /// </summary> | 40 | /// </summary> |
41 | public LLUUID UUID; | 41 | private LLUUID _id; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// The last used Web_login_key | 44 | /// The last used Web_login_key |
45 | /// </summary> | 45 | /// </summary> |
46 | public 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 | public string username; | 50 | private string username; |
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 | public 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 | public 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 | public 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 |
@@ -78,74 +78,272 @@ namespace OpenSim.Framework | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | public uint homeRegionX; | 81 | public LLUUID Id { |
82 | public uint homeRegionY; | 82 | get { |
83 | return _id; | ||
84 | } | ||
85 | set { | ||
86 | _id = value; | ||
87 | } | ||
88 | } | ||
89 | |||
90 | public LLUUID WebLoginKey { | ||
91 | get { | ||
92 | return webLoginKey; | ||
93 | } | ||
94 | set { | ||
95 | webLoginKey = value; | ||
96 | } | ||
97 | } | ||
98 | |||
99 | public string FirstName { | ||
100 | get { | ||
101 | return username; | ||
102 | } | ||
103 | set { | ||
104 | username = value; | ||
105 | } | ||
106 | } | ||
107 | |||
108 | public string SurName { | ||
109 | get { | ||
110 | return surname; | ||
111 | } | ||
112 | set { | ||
113 | surname = value; | ||
114 | } | ||
115 | } | ||
116 | |||
117 | public string PasswordHash { | ||
118 | get { | ||
119 | return passwordHash; | ||
120 | } | ||
121 | set { | ||
122 | passwordHash = value; | ||
123 | } | ||
124 | } | ||
125 | |||
126 | public string PasswordSalt { | ||
127 | get { | ||
128 | return passwordSalt; | ||
129 | } | ||
130 | set { | ||
131 | passwordSalt = value; | ||
132 | } | ||
133 | } | ||
134 | |||
135 | public uint HomeRegionX { | ||
136 | get { | ||
137 | return homeRegionX; | ||
138 | } | ||
139 | set { | ||
140 | homeRegionX = value; | ||
141 | } | ||
142 | } | ||
143 | |||
144 | public uint HomeRegionY { | ||
145 | get { | ||
146 | return homeRegionY; | ||
147 | } | ||
148 | set { | ||
149 | homeRegionY = value; | ||
150 | } | ||
151 | } | ||
152 | |||
153 | public LLVector3 HomeLocation { | ||
154 | get { | ||
155 | return homeLocation; | ||
156 | } | ||
157 | set { | ||
158 | homeLocation = value; | ||
159 | } | ||
160 | } | ||
161 | |||
162 | public LLVector3 HomeLookAt { | ||
163 | get { | ||
164 | return homeLookAt; | ||
165 | } | ||
166 | set { | ||
167 | homeLookAt = value; | ||
168 | } | ||
169 | } | ||
170 | |||
171 | public int Created { | ||
172 | get { | ||
173 | return created; | ||
174 | } | ||
175 | set { | ||
176 | created = value; | ||
177 | } | ||
178 | } | ||
179 | |||
180 | public int LastLogin { | ||
181 | get { | ||
182 | return lastLogin; | ||
183 | } | ||
184 | set { | ||
185 | lastLogin = value; | ||
186 | } | ||
187 | } | ||
188 | |||
189 | public LLUUID RootInventoryFolderID { | ||
190 | get { | ||
191 | return rootInventoryFolderID; | ||
192 | } | ||
193 | set { | ||
194 | rootInventoryFolderID = value; | ||
195 | } | ||
196 | } | ||
197 | |||
198 | public string UserInventoryURI { | ||
199 | get { | ||
200 | return userInventoryURI; | ||
201 | } | ||
202 | set { | ||
203 | userInventoryURI = value; | ||
204 | } | ||
205 | } | ||
206 | |||
207 | public string UserAssetURI { | ||
208 | get { | ||
209 | return userAssetURI; | ||
210 | } | ||
211 | set { | ||
212 | userAssetURI = value; | ||
213 | } | ||
214 | } | ||
215 | |||
216 | public uint ProfileCanDoMask { | ||
217 | get { | ||
218 | return profileCanDoMask; | ||
219 | } | ||
220 | set { | ||
221 | profileCanDoMask = value; | ||
222 | } | ||
223 | } | ||
224 | |||
225 | public uint ProfileWantDoMask { | ||
226 | get { | ||
227 | return profileWantDoMask; | ||
228 | } | ||
229 | set { | ||
230 | profileWantDoMask = value; | ||
231 | } | ||
232 | } | ||
233 | |||
234 | public string ProfileAboutText { | ||
235 | get { | ||
236 | return profileAboutText; | ||
237 | } | ||
238 | set { | ||
239 | profileAboutText = value; | ||
240 | } | ||
241 | } | ||
242 | |||
243 | public string ProfileFirstText { | ||
244 | get { | ||
245 | return profileFirstText; | ||
246 | } | ||
247 | set { | ||
248 | profileFirstText = value; | ||
249 | } | ||
250 | } | ||
251 | |||
252 | public LLUUID ProfileImage { | ||
253 | get { | ||
254 | return profileImage; | ||
255 | } | ||
256 | set { | ||
257 | profileImage = value; | ||
258 | } | ||
259 | } | ||
260 | |||
261 | public LLUUID ProfileFirstImage { | ||
262 | get { | ||
263 | return profileFirstImage; | ||
264 | } | ||
265 | set { | ||
266 | profileFirstImage = value; | ||
267 | } | ||
268 | } | ||
269 | |||
270 | public UserAgentData CurrentAgent { | ||
271 | get { | ||
272 | return currentAgent; | ||
273 | } | ||
274 | set { | ||
275 | currentAgent = value; | ||
276 | } | ||
277 | } | ||
278 | |||
279 | private uint homeRegionX; | ||
280 | private uint homeRegionY; | ||
83 | 281 | ||
84 | /// <summary> | 282 | /// <summary> |
85 | /// The coordinates inside the region of the home location | 283 | /// The coordinates inside the region of the home location |
86 | /// </summary> | 284 | /// </summary> |
87 | public LLVector3 homeLocation; | 285 | private LLVector3 homeLocation; |
88 | 286 | ||
89 | /// <summary> | 287 | /// <summary> |
90 | /// Where the user will be looking when they rez. | 288 | /// Where the user will be looking when they rez. |
91 | /// </summary> | 289 | /// </summary> |
92 | public LLVector3 homeLookAt; | 290 | private LLVector3 homeLookAt; |
93 | 291 | ||
94 | /// <summary> | 292 | /// <summary> |
95 | /// A UNIX Timestamp (seconds since epoch) for the users creation | 293 | /// A UNIX Timestamp (seconds since epoch) for the users creation |
96 | /// </summary> | 294 | /// </summary> |
97 | public int created; | 295 | private int created; |
98 | 296 | ||
99 | /// <summary> | 297 | /// <summary> |
100 | /// A UNIX Timestamp for the users last login date / time | 298 | /// A UNIX Timestamp for the users last login date / time |
101 | /// </summary> | 299 | /// </summary> |
102 | public int lastLogin; | 300 | private int lastLogin; |
103 | 301 | ||
104 | public LLUUID rootInventoryFolderID; | 302 | private LLUUID rootInventoryFolderID; |
105 | 303 | ||
106 | /// <summary> | 304 | /// <summary> |
107 | /// 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 |
108 | /// </summary> | 306 | /// </summary> |
109 | public string userInventoryURI = String.Empty; | 307 | private string userInventoryURI = String.Empty; |
110 | 308 | ||
111 | /// <summary> | 309 | /// <summary> |
112 | /// 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. |
113 | /// </summary> | 311 | /// </summary> |
114 | public string userAssetURI = String.Empty; | 312 | private string userAssetURI = String.Empty; |
115 | 313 | ||
116 | /// <summary> | 314 | /// <summary> |
117 | /// 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 |
118 | /// </summary> | 316 | /// </summary> |
119 | public uint profileCanDoMask; | 317 | private uint profileCanDoMask; |
120 | 318 | ||
121 | /// <summary> | 319 | /// <summary> |
122 | /// 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 |
123 | /// </summary> | 321 | /// </summary> |
124 | public uint profileWantDoMask; // Profile window "I want to" mask | 322 | private uint profileWantDoMask; // Profile window "I want to" mask |
125 | 323 | ||
126 | /// <summary> | 324 | /// <summary> |
127 | /// The about text listed in a users profile. | 325 | /// The about text listed in a users profile. |
128 | /// </summary> | 326 | /// </summary> |
129 | public string profileAboutText = String.Empty; | 327 | private string profileAboutText = String.Empty; |
130 | 328 | ||
131 | /// <summary> | 329 | /// <summary> |
132 | /// The first life about text listed in a users profile | 330 | /// The first life about text listed in a users profile |
133 | /// </summary> | 331 | /// </summary> |
134 | public string profileFirstText = String.Empty; | 332 | private string profileFirstText = String.Empty; |
135 | 333 | ||
136 | /// <summary> | 334 | /// <summary> |
137 | /// The profile image for an avatar stored on the asset server | 335 | /// The profile image for an avatar stored on the asset server |
138 | /// </summary> | 336 | /// </summary> |
139 | public LLUUID profileImage; | 337 | private LLUUID profileImage; |
140 | 338 | ||
141 | /// <summary> | 339 | /// <summary> |
142 | /// The profile image for the users first life tab | 340 | /// The profile image for the users first life tab |
143 | /// </summary> | 341 | /// </summary> |
144 | public LLUUID profileFirstImage; | 342 | private LLUUID profileFirstImage; |
145 | 343 | ||
146 | /// <summary> | 344 | /// <summary> |
147 | /// The users last registered agent (filled in on the user server) | 345 | /// The users last registered agent (filled in on the user server) |
148 | /// </summary> | 346 | /// </summary> |
149 | public UserAgentData currentAgent; | 347 | private UserAgentData currentAgent; |
150 | } | 348 | } |
151 | } | 349 | } |