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/Communications/LoginResponse.cs | |
parent | * Deleted .user file (diff) | |
download | opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.zip opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.gz opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.bz2 opensim-SC-67e12b95ea7b68f4904a7484d77ecfd787d16d0c.tar.xz |
* Optimized usings
* Shortened type references
* Removed redundant 'this' qualifier
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/LoginResponse.cs | 594 |
1 files changed, 211 insertions, 383 deletions
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs index 38bc016..4d1c35a 100644 --- a/OpenSim/Framework/Communications/LoginResponse.cs +++ b/OpenSim/Framework/Communications/LoginResponse.cs | |||
@@ -34,12 +34,10 @@ using OpenSim.Framework.Console; | |||
34 | 34 | ||
35 | namespace OpenSim.Framework.UserManagement | 35 | namespace OpenSim.Framework.UserManagement |
36 | { | 36 | { |
37 | |||
38 | /// <summary> | 37 | /// <summary> |
39 | /// A temp class to handle login response. | 38 | /// A temp class to handle login response. |
40 | /// Should make use of UserProfileManager where possible. | 39 | /// Should make use of UserProfileManager where possible. |
41 | /// </summary> | 40 | /// </summary> |
42 | |||
43 | public class LoginResponse | 41 | public class LoginResponse |
44 | { | 42 | { |
45 | private Hashtable loginFlagsHash; | 43 | private Hashtable loginFlagsHash; |
@@ -103,211 +101,222 @@ namespace OpenSim.Framework.UserManagement | |||
103 | 101 | ||
104 | public LoginResponse() | 102 | public LoginResponse() |
105 | { | 103 | { |
106 | this.loginFlags = new ArrayList(); | 104 | loginFlags = new ArrayList(); |
107 | this.globalTextures = new ArrayList(); | 105 | globalTextures = new ArrayList(); |
108 | this.eventCategories = new ArrayList(); | 106 | eventCategories = new ArrayList(); |
109 | this.uiConfig = new ArrayList(); | 107 | uiConfig = new ArrayList(); |
110 | this.classifiedCategories = new ArrayList(); | 108 | classifiedCategories = new ArrayList(); |
111 | 109 | ||
112 | this.loginError = new Hashtable(); | 110 | loginError = new Hashtable(); |
113 | this.uiConfigHash = new Hashtable(); | 111 | uiConfigHash = new Hashtable(); |
114 | 112 | ||
115 | this.defaultXmlRpcResponse = new XmlRpcResponse(); | 113 | defaultXmlRpcResponse = new XmlRpcResponse(); |
116 | this.userProfile = new UserInfo(); | 114 | userProfile = new UserInfo(); |
117 | this.inventoryRoot = new ArrayList(); | 115 | inventoryRoot = new ArrayList(); |
118 | this.initialOutfit = new ArrayList(); | 116 | initialOutfit = new ArrayList(); |
119 | this.agentInventory = new ArrayList(); | 117 | agentInventory = new ArrayList(); |
120 | this.inventoryLibrary = new ArrayList(); | 118 | inventoryLibrary = new ArrayList(); |
121 | this.inventoryLibraryOwner = new ArrayList(); | 119 | inventoryLibraryOwner = new ArrayList(); |
122 | 120 | ||
123 | this.xmlRpcResponse = new XmlRpcResponse(); | 121 | xmlRpcResponse = new XmlRpcResponse(); |
124 | this.defaultXmlRpcResponse = new XmlRpcResponse(); | 122 | defaultXmlRpcResponse = new XmlRpcResponse(); |
125 | 123 | ||
126 | this.SetDefaultValues(); | 124 | SetDefaultValues(); |
127 | } // LoginServer | 125 | } // LoginServer |
128 | 126 | ||
129 | public void SetDefaultValues() | 127 | public void SetDefaultValues() |
130 | { | 128 | { |
131 | this.DST = "N"; | 129 | DST = "N"; |
132 | this.StipendSinceLogin = "N"; | 130 | StipendSinceLogin = "N"; |
133 | this.Gendered = "Y"; | 131 | Gendered = "Y"; |
134 | this.EverLoggedIn = "Y"; | 132 | EverLoggedIn = "Y"; |
135 | this.login = "false"; | 133 | login = "false"; |
136 | this.firstname = "Test"; | 134 | firstname = "Test"; |
137 | this.lastname = "User"; | 135 | lastname = "User"; |
138 | this.agentAccess = "M"; | 136 | agentAccess = "M"; |
139 | this.startLocation = "last"; | 137 | startLocation = "last"; |
140 | this.allowFirstLife = "Y"; | 138 | allowFirstLife = "Y"; |
141 | 139 | ||
142 | this.SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271"; | 140 | SunTexture = "cce0f112-878f-4586-a2e2-a8f104bba271"; |
143 | this.CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; | 141 | CloudTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; |
144 | this.MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; | 142 | MoonTexture = "fc4b9f0b-d008-45c6-96a4-01dd947ac621"; |
145 | 143 | ||
146 | this.ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock."; | 144 | ErrorMessage = "You have entered an invalid name/password combination. Check Caps/lock."; |
147 | this.ErrorReason = "key"; | 145 | ErrorReason = "key"; |
148 | this.welcomeMessage = "Welcome to OpenSim!"; | 146 | welcomeMessage = "Welcome to OpenSim!"; |
149 | this.seedCapability = ""; | 147 | seedCapability = ""; |
150 | this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}"; | 148 | home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" + |
151 | this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]"; | 149 | userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" + |
152 | this.RegionX = (uint)255232; | 150 | userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" + |
153 | this.RegionY = (uint)254976; | 151 | userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}"; |
154 | 152 | lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]"; | |
155 | // Classifieds; | 153 | RegionX = (uint) 255232; |
156 | this.AddClassifiedCategory((Int32)1, "Shopping"); | 154 | RegionY = (uint) 254976; |
157 | this.AddClassifiedCategory((Int32)2, "Land Rental"); | 155 | |
158 | this.AddClassifiedCategory((Int32)3, "Property Rental"); | 156 | // Classifieds; |
159 | this.AddClassifiedCategory((Int32)4, "Special Attraction"); | 157 | AddClassifiedCategory((Int32) 1, "Shopping"); |
160 | this.AddClassifiedCategory((Int32)5, "New Products"); | 158 | AddClassifiedCategory((Int32) 2, "Land Rental"); |
161 | this.AddClassifiedCategory((Int32)6, "Employment"); | 159 | AddClassifiedCategory((Int32) 3, "Property Rental"); |
162 | this.AddClassifiedCategory((Int32)7, "Wanted"); | 160 | AddClassifiedCategory((Int32) 4, "Special Attraction"); |
163 | this.AddClassifiedCategory((Int32)8, "Service"); | 161 | AddClassifiedCategory((Int32) 5, "New Products"); |
164 | this.AddClassifiedCategory((Int32)9, "Personal"); | 162 | AddClassifiedCategory((Int32) 6, "Employment"); |
165 | 163 | AddClassifiedCategory((Int32) 7, "Wanted"); | |
166 | 164 | AddClassifiedCategory((Int32) 8, "Service"); | |
167 | this.SessionID = LLUUID.Random(); | 165 | AddClassifiedCategory((Int32) 9, "Personal"); |
168 | this.SecureSessionID = LLUUID.Random(); | 166 | |
169 | this.AgentID = LLUUID.Random(); | 167 | |
170 | 168 | SessionID = LLUUID.Random(); | |
171 | Hashtable InitialOutfitHash = new Hashtable(); | 169 | SecureSessionID = LLUUID.Random(); |
172 | InitialOutfitHash["folder_name"] = "Nightclub Female"; | 170 | AgentID = LLUUID.Random(); |
173 | InitialOutfitHash["gender"] = "female"; | 171 | |
174 | this.initialOutfit.Add(InitialOutfitHash); | 172 | Hashtable InitialOutfitHash = new Hashtable(); |
175 | 173 | InitialOutfitHash["folder_name"] = "Nightclub Female"; | |
176 | 174 | InitialOutfitHash["gender"] = "female"; | |
175 | initialOutfit.Add(InitialOutfitHash); | ||
177 | } // SetDefaultValues | 176 | } // SetDefaultValues |
178 | 177 | ||
179 | #region Login Failure Methods | 178 | #region Login Failure Methods |
179 | |||
180 | public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login) | 180 | public XmlRpcResponse GenerateFailureResponse(string reason, string message, string login) |
181 | { | 181 | { |
182 | // Overwrite any default values; | 182 | // Overwrite any default values; |
183 | this.xmlRpcResponse = new XmlRpcResponse(); | 183 | xmlRpcResponse = new XmlRpcResponse(); |
184 | 184 | ||
185 | // Ensure Login Failed message/reason; | 185 | // Ensure Login Failed message/reason; |
186 | this.ErrorMessage = message; | 186 | ErrorMessage = message; |
187 | this.ErrorReason = reason; | 187 | ErrorReason = reason; |
188 | 188 | ||
189 | this.loginError["reason"] = this.ErrorReason; | 189 | loginError["reason"] = ErrorReason; |
190 | this.loginError["message"] = this.ErrorMessage; | 190 | loginError["message"] = ErrorMessage; |
191 | this.loginError["login"] = login; | 191 | loginError["login"] = login; |
192 | this.xmlRpcResponse.Value = this.loginError; | 192 | xmlRpcResponse.Value = loginError; |
193 | return (this.xmlRpcResponse); | 193 | return (xmlRpcResponse); |
194 | } // GenerateResponse | 194 | } // GenerateResponse |
195 | 195 | ||
196 | public XmlRpcResponse CreateFailedResponse() | 196 | public XmlRpcResponse CreateFailedResponse() |
197 | { | 197 | { |
198 | return (this.CreateLoginFailedResponse()); | 198 | return (CreateLoginFailedResponse()); |
199 | } // CreateErrorConnectingToGridResponse() | 199 | } // CreateErrorConnectingToGridResponse() |
200 | 200 | ||
201 | public XmlRpcResponse CreateLoginFailedResponse() | 201 | public XmlRpcResponse CreateLoginFailedResponse() |
202 | { | 202 | { |
203 | return (this.GenerateFailureResponse("key", "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", "false")); | 203 | return |
204 | (GenerateFailureResponse("key", | ||
205 | "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", | ||
206 | "false")); | ||
204 | } // LoginFailedResponse | 207 | } // LoginFailedResponse |
205 | 208 | ||
206 | public XmlRpcResponse CreateAlreadyLoggedInResponse() | 209 | public XmlRpcResponse CreateAlreadyLoggedInResponse() |
207 | { | 210 | { |
208 | return (this.GenerateFailureResponse("presence", "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner", "false")); | 211 | return |
212 | (GenerateFailureResponse("presence", | ||
213 | "You appear to be already logged in, if this is not the case please wait for your session to timeout, if this takes longer than a few minutes please contact the grid owner", | ||
214 | "false")); | ||
209 | } // CreateAlreadyLoggedInResponse() | 215 | } // CreateAlreadyLoggedInResponse() |
210 | 216 | ||
211 | public XmlRpcResponse CreateDeadRegionResponse() | 217 | public XmlRpcResponse CreateDeadRegionResponse() |
212 | { | 218 | { |
213 | return (this.GenerateFailureResponse("key", "The region you are attempting to log into is not responding. Please select another region and try again.", "false")); | 219 | return |
220 | (GenerateFailureResponse("key", | ||
221 | "The region you are attempting to log into is not responding. Please select another region and try again.", | ||
222 | "false")); | ||
214 | } | 223 | } |
215 | 224 | ||
216 | public XmlRpcResponse CreateGridErrorResponse() | 225 | public XmlRpcResponse CreateGridErrorResponse() |
217 | { | 226 | { |
218 | return (this.GenerateFailureResponse("key", "Error connecting to grid. Could not percieve credentials from login XML.", "false")); | 227 | return |
228 | (GenerateFailureResponse("key", | ||
229 | "Error connecting to grid. Could not percieve credentials from login XML.", | ||
230 | "false")); | ||
219 | } | 231 | } |
220 | 232 | ||
221 | #endregion | 233 | #endregion |
222 | 234 | ||
223 | public XmlRpcResponse ToXmlRpcResponse() | 235 | public XmlRpcResponse ToXmlRpcResponse() |
224 | { | 236 | { |
225 | try | 237 | try |
226 | { | 238 | { |
227 | |||
228 | Hashtable responseData = new Hashtable(); | 239 | Hashtable responseData = new Hashtable(); |
229 | 240 | ||
230 | this.loginFlagsHash = new Hashtable(); | 241 | loginFlagsHash = new Hashtable(); |
231 | this.loginFlagsHash["daylight_savings"] = this.DST; | 242 | loginFlagsHash["daylight_savings"] = DST; |
232 | this.loginFlagsHash["stipend_since_login"] = this.StipendSinceLogin; | 243 | loginFlagsHash["stipend_since_login"] = StipendSinceLogin; |
233 | this.loginFlagsHash["gendered"] = this.Gendered; | 244 | loginFlagsHash["gendered"] = Gendered; |
234 | this.loginFlagsHash["ever_logged_in"] = this.EverLoggedIn; | 245 | loginFlagsHash["ever_logged_in"] = EverLoggedIn; |
235 | this.loginFlags.Add(this.loginFlagsHash); | 246 | loginFlags.Add(loginFlagsHash); |
236 | 247 | ||
237 | responseData["first_name"] = this.Firstname; | 248 | responseData["first_name"] = Firstname; |
238 | responseData["last_name"] = this.Lastname; | 249 | responseData["last_name"] = Lastname; |
239 | responseData["agent_access"] = this.agentAccess; | 250 | responseData["agent_access"] = agentAccess; |
240 | 251 | ||
241 | this.globalTexturesHash = new Hashtable(); | 252 | globalTexturesHash = new Hashtable(); |
242 | this.globalTexturesHash["sun_texture_id"] = this.SunTexture; | 253 | globalTexturesHash["sun_texture_id"] = SunTexture; |
243 | this.globalTexturesHash["cloud_texture_id"] = this.CloudTexture; | 254 | globalTexturesHash["cloud_texture_id"] = CloudTexture; |
244 | this.globalTexturesHash["moon_texture_id"] = this.MoonTexture; | 255 | globalTexturesHash["moon_texture_id"] = MoonTexture; |
245 | this.globalTextures.Add(this.globalTexturesHash); | 256 | globalTextures.Add(globalTexturesHash); |
246 | // this.eventCategories.Add(this.eventCategoriesHash); | 257 | // this.eventCategories.Add(this.eventCategoriesHash); |
247 | 258 | ||
248 | this.AddToUIConfig("allow_first_life", this.allowFirstLife); | 259 | AddToUIConfig("allow_first_life", allowFirstLife); |
249 | this.uiConfig.Add(this.uiConfigHash); | 260 | uiConfig.Add(uiConfigHash); |
250 | 261 | ||
251 | responseData["sim_port"] =(Int32) this.SimPort; | 262 | responseData["sim_port"] = (Int32) SimPort; |
252 | responseData["sim_ip"] = this.SimAddress; | 263 | responseData["sim_ip"] = SimAddress; |
253 | 264 | ||
254 | responseData["agent_id"] = this.AgentID.ToStringHyphenated(); | 265 | responseData["agent_id"] = AgentID.ToStringHyphenated(); |
255 | responseData["session_id"] = this.SessionID.ToStringHyphenated(); | 266 | responseData["session_id"] = SessionID.ToStringHyphenated(); |
256 | responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); | 267 | responseData["secure_session_id"] = SecureSessionID.ToStringHyphenated(); |
257 | responseData["circuit_code"] = this.CircuitCode; | 268 | responseData["circuit_code"] = CircuitCode; |
258 | responseData["seconds_since_epoch"] = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 269 | responseData["seconds_since_epoch"] = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
259 | responseData["login-flags"] = this.loginFlags; | 270 | responseData["login-flags"] = loginFlags; |
260 | responseData["global-textures"] = this.globalTextures; | 271 | responseData["global-textures"] = globalTextures; |
261 | responseData["seed_capability"] = this.seedCapability; | 272 | responseData["seed_capability"] = seedCapability; |
262 | 273 | ||
263 | responseData["event_categories"] = this.eventCategories; | 274 | responseData["event_categories"] = eventCategories; |
264 | responseData["event_notifications"] = new ArrayList(); // todo | 275 | responseData["event_notifications"] = new ArrayList(); // todo |
265 | responseData["classified_categories"] = this.classifiedCategories; | 276 | responseData["classified_categories"] = classifiedCategories; |
266 | responseData["ui-config"] = this.uiConfig; | 277 | responseData["ui-config"] = uiConfig; |
267 | 278 | ||
268 | responseData["inventory-skeleton"] = this.agentInventory; | 279 | responseData["inventory-skeleton"] = agentInventory; |
269 | responseData["inventory-skel-lib"] = this.inventoryLibrary; | 280 | responseData["inventory-skel-lib"] = inventoryLibrary; |
270 | responseData["inventory-root"] = this.inventoryRoot; | 281 | responseData["inventory-root"] = inventoryRoot; |
271 | responseData["gestures"] = new ArrayList(); // todo | 282 | responseData["gestures"] = new ArrayList(); // todo |
272 | responseData["inventory-lib-owner"] = this.inventoryLibraryOwner; | 283 | responseData["inventory-lib-owner"] = inventoryLibraryOwner; |
273 | responseData["initial-outfit"] = this.initialOutfit; | 284 | responseData["initial-outfit"] = initialOutfit; |
274 | responseData["start_location"] = this.startLocation; | 285 | responseData["start_location"] = startLocation; |
275 | responseData["seed_capability"] = this.seedCapability; | 286 | responseData["seed_capability"] = seedCapability; |
276 | responseData["home"] = this.home; | 287 | responseData["home"] = home; |
277 | responseData["look_at"] = this.lookAt; | 288 | responseData["look_at"] = lookAt; |
278 | responseData["message"] = this.welcomeMessage; | 289 | responseData["message"] = welcomeMessage; |
279 | responseData["region_x"] = (Int32)this.RegionX * 256; | 290 | responseData["region_x"] = (Int32) RegionX*256; |
280 | responseData["region_y"] = (Int32)this.RegionY * 256; | 291 | responseData["region_y"] = (Int32) RegionY*256; |
281 | 292 | ||
282 | //responseData["inventory-lib-root"] = new ArrayList(); // todo | 293 | //responseData["inventory-lib-root"] = new ArrayList(); // todo |
283 | //responseData["buddy-list"] = new ArrayList(); // todo | 294 | //responseData["buddy-list"] = new ArrayList(); // todo |
284 | 295 | ||
285 | responseData["login"] = "true"; | 296 | responseData["login"] = "true"; |
286 | this.xmlRpcResponse.Value = responseData; | 297 | xmlRpcResponse.Value = responseData; |
287 | 298 | ||
288 | return (this.xmlRpcResponse); | 299 | return (xmlRpcResponse); |
289 | } | 300 | } |
290 | catch (Exception e) | 301 | catch (Exception e) |
291 | { | 302 | { |
292 | MainLog.Instance.Warn( | 303 | MainLog.Instance.Warn( |
293 | "CLIENT", | 304 | "CLIENT", |
294 | "LoginResponse: Error creating XML-RPC Response: " + e.Message | 305 | "LoginResponse: Error creating XML-RPC Response: " + e.Message |
295 | ); | 306 | ); |
296 | return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); | 307 | return (GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); |
297 | |||
298 | } | 308 | } |
299 | |||
300 | } // ToXmlRpcResponse | 309 | } // ToXmlRpcResponse |
301 | 310 | ||
302 | public void SetEventCategories(string category, string value) | 311 | public void SetEventCategories(string category, string value) |
303 | { | 312 | { |
304 | // this.eventCategoriesHash[category] = value; | 313 | // this.eventCategoriesHash[category] = value; |
305 | //TODO | 314 | //TODO |
306 | } // SetEventCategories | 315 | } // SetEventCategories |
307 | 316 | ||
308 | public void AddToUIConfig(string itemName, string item) | 317 | public void AddToUIConfig(string itemName, string item) |
309 | { | 318 | { |
310 | this.uiConfigHash[itemName] = item; | 319 | uiConfigHash[itemName] = item; |
311 | } // SetUIConfig | 320 | } // SetUIConfig |
312 | 321 | ||
313 | public void AddClassifiedCategory(Int32 ID, string categoryName) | 322 | public void AddClassifiedCategory(Int32 ID, string categoryName) |
@@ -315,372 +324,193 @@ namespace OpenSim.Framework.UserManagement | |||
315 | Hashtable hash = new Hashtable(); | 324 | Hashtable hash = new Hashtable(); |
316 | hash["category_name"] = categoryName; | 325 | hash["category_name"] = categoryName; |
317 | hash["category_id"] = ID; | 326 | hash["category_id"] = ID; |
318 | this.classifiedCategories.Add(hash); | 327 | classifiedCategories.Add(hash); |
319 | // this.classifiedCategoriesHash.Clear(); | 328 | // this.classifiedCategoriesHash.Clear(); |
320 | } // SetClassifiedCategory | 329 | } // SetClassifiedCategory |
321 | 330 | ||
322 | #region Properties | 331 | #region Properties |
332 | |||
323 | public string Login | 333 | public string Login |
324 | { | 334 | { |
325 | get | 335 | get { return login; } |
326 | { | 336 | set { login = value; } |
327 | return this.login; | ||
328 | } | ||
329 | set | ||
330 | { | ||
331 | this.login = value; | ||
332 | } | ||
333 | } // Login | 337 | } // Login |
334 | 338 | ||
335 | public string DST | 339 | public string DST |
336 | { | 340 | { |
337 | get | 341 | get { return dst; } |
338 | { | 342 | set { dst = value; } |
339 | return this.dst; | ||
340 | } | ||
341 | set | ||
342 | { | ||
343 | this.dst = value; | ||
344 | } | ||
345 | } // DST | 343 | } // DST |
346 | 344 | ||
347 | public string StipendSinceLogin | 345 | public string StipendSinceLogin |
348 | { | 346 | { |
349 | get | 347 | get { return stipendSinceLogin; } |
350 | { | 348 | set { stipendSinceLogin = value; } |
351 | return this.stipendSinceLogin; | ||
352 | } | ||
353 | set | ||
354 | { | ||
355 | this.stipendSinceLogin = value; | ||
356 | } | ||
357 | } // StipendSinceLogin | 349 | } // StipendSinceLogin |
358 | 350 | ||
359 | public string Gendered | 351 | public string Gendered |
360 | { | 352 | { |
361 | get | 353 | get { return gendered; } |
362 | { | 354 | set { gendered = value; } |
363 | return this.gendered; | ||
364 | } | ||
365 | set | ||
366 | { | ||
367 | this.gendered = value; | ||
368 | } | ||
369 | } // Gendered | 355 | } // Gendered |
370 | 356 | ||
371 | public string EverLoggedIn | 357 | public string EverLoggedIn |
372 | { | 358 | { |
373 | get | 359 | get { return everLoggedIn; } |
374 | { | 360 | set { everLoggedIn = value; } |
375 | return this.everLoggedIn; | ||
376 | } | ||
377 | set | ||
378 | { | ||
379 | this.everLoggedIn = value; | ||
380 | } | ||
381 | } // EverLoggedIn | 361 | } // EverLoggedIn |
382 | 362 | ||
383 | public int SimPort | 363 | public int SimPort |
384 | { | 364 | { |
385 | get | 365 | get { return simPort; } |
386 | { | 366 | set { simPort = value; } |
387 | return this.simPort; | ||
388 | } | ||
389 | set | ||
390 | { | ||
391 | this.simPort = value; | ||
392 | } | ||
393 | } // SimPort | 367 | } // SimPort |
394 | 368 | ||
395 | public string SimAddress | 369 | public string SimAddress |
396 | { | 370 | { |
397 | get | 371 | get { return simAddress; } |
398 | { | 372 | set { simAddress = value; } |
399 | return this.simAddress; | ||
400 | } | ||
401 | set | ||
402 | { | ||
403 | this.simAddress = value; | ||
404 | } | ||
405 | } // SimAddress | 373 | } // SimAddress |
406 | 374 | ||
407 | public LLUUID AgentID | 375 | public LLUUID AgentID |
408 | { | 376 | { |
409 | get | 377 | get { return agentID; } |
410 | { | 378 | set { agentID = value; } |
411 | return this.agentID; | ||
412 | } | ||
413 | set | ||
414 | { | ||
415 | this.agentID = value; | ||
416 | } | ||
417 | } // AgentID | 379 | } // AgentID |
418 | 380 | ||
419 | public LLUUID SessionID | 381 | public LLUUID SessionID |
420 | { | 382 | { |
421 | get | 383 | get { return sessionID; } |
422 | { | 384 | set { sessionID = value; } |
423 | return this.sessionID; | ||
424 | } | ||
425 | set | ||
426 | { | ||
427 | this.sessionID = value; | ||
428 | } | ||
429 | } // SessionID | 385 | } // SessionID |
430 | 386 | ||
431 | public LLUUID SecureSessionID | 387 | public LLUUID SecureSessionID |
432 | { | 388 | { |
433 | get | 389 | get { return secureSessionID; } |
434 | { | 390 | set { secureSessionID = value; } |
435 | return this.secureSessionID; | ||
436 | } | ||
437 | set | ||
438 | { | ||
439 | this.secureSessionID = value; | ||
440 | } | ||
441 | } // SecureSessionID | 391 | } // SecureSessionID |
442 | 392 | ||
443 | public Int32 CircuitCode | 393 | public Int32 CircuitCode |
444 | { | 394 | { |
445 | get | 395 | get { return circuitCode; } |
446 | { | 396 | set { circuitCode = value; } |
447 | return this.circuitCode; | ||
448 | } | ||
449 | set | ||
450 | { | ||
451 | this.circuitCode = value; | ||
452 | } | ||
453 | } // CircuitCode | 397 | } // CircuitCode |
454 | 398 | ||
455 | public uint RegionX | 399 | public uint RegionX |
456 | { | 400 | { |
457 | get | 401 | get { return regionX; } |
458 | { | 402 | set { regionX = value; } |
459 | return this.regionX; | ||
460 | } | ||
461 | set | ||
462 | { | ||
463 | this.regionX = value; | ||
464 | } | ||
465 | } // RegionX | 403 | } // RegionX |
466 | 404 | ||
467 | public uint RegionY | 405 | public uint RegionY |
468 | { | 406 | { |
469 | get | 407 | get { return regionY; } |
470 | { | 408 | set { regionY = value; } |
471 | return this.regionY; | ||
472 | } | ||
473 | set | ||
474 | { | ||
475 | this.regionY = value; | ||
476 | } | ||
477 | } // RegionY | 409 | } // RegionY |
478 | 410 | ||
479 | public string SunTexture | 411 | public string SunTexture |
480 | { | 412 | { |
481 | get | 413 | get { return sunTexture; } |
482 | { | 414 | set { sunTexture = value; } |
483 | return this.sunTexture; | ||
484 | } | ||
485 | set | ||
486 | { | ||
487 | this.sunTexture = value; | ||
488 | } | ||
489 | } // SunTexture | 415 | } // SunTexture |
490 | 416 | ||
491 | public string CloudTexture | 417 | public string CloudTexture |
492 | { | 418 | { |
493 | get | 419 | get { return cloudTexture; } |
494 | { | 420 | set { cloudTexture = value; } |
495 | return this.cloudTexture; | ||
496 | } | ||
497 | set | ||
498 | { | ||
499 | this.cloudTexture = value; | ||
500 | } | ||
501 | } // CloudTexture | 421 | } // CloudTexture |
502 | 422 | ||
503 | public string MoonTexture | 423 | public string MoonTexture |
504 | { | 424 | { |
505 | get | 425 | get { return moonTexture; } |
506 | { | 426 | set { moonTexture = value; } |
507 | return this.moonTexture; | ||
508 | } | ||
509 | set | ||
510 | { | ||
511 | this.moonTexture = value; | ||
512 | } | ||
513 | } // MoonTexture | 427 | } // MoonTexture |
514 | 428 | ||
515 | public string Firstname | 429 | public string Firstname |
516 | { | 430 | { |
517 | get | 431 | get { return firstname; } |
518 | { | 432 | set { firstname = value; } |
519 | return this.firstname; | ||
520 | } | ||
521 | set | ||
522 | { | ||
523 | this.firstname = value; | ||
524 | } | ||
525 | } // Firstname | 433 | } // Firstname |
526 | 434 | ||
527 | public string Lastname | 435 | public string Lastname |
528 | { | 436 | { |
529 | get | 437 | get { return lastname; } |
530 | { | 438 | set { lastname = value; } |
531 | return this.lastname; | ||
532 | } | ||
533 | set | ||
534 | { | ||
535 | this.lastname = value; | ||
536 | } | ||
537 | } // Lastname | 439 | } // Lastname |
538 | 440 | ||
539 | public string AgentAccess | 441 | public string AgentAccess |
540 | { | 442 | { |
541 | get | 443 | get { return agentAccess; } |
542 | { | 444 | set { agentAccess = value; } |
543 | return this.agentAccess; | ||
544 | } | ||
545 | set | ||
546 | { | ||
547 | this.agentAccess = value; | ||
548 | } | ||
549 | } | 445 | } |
550 | 446 | ||
551 | public string StartLocation | 447 | public string StartLocation |
552 | { | 448 | { |
553 | get | 449 | get { return startLocation; } |
554 | { | 450 | set { startLocation = value; } |
555 | return this.startLocation; | ||
556 | } | ||
557 | set | ||
558 | { | ||
559 | this.startLocation = value; | ||
560 | } | ||
561 | } // StartLocation | 451 | } // StartLocation |
562 | 452 | ||
563 | public string LookAt | 453 | public string LookAt |
564 | { | 454 | { |
565 | get | 455 | get { return lookAt; } |
566 | { | 456 | set { lookAt = value; } |
567 | return this.lookAt; | ||
568 | } | ||
569 | set | ||
570 | { | ||
571 | this.lookAt = value; | ||
572 | } | ||
573 | } | 457 | } |
574 | 458 | ||
575 | public string SeedCapability | 459 | public string SeedCapability |
576 | { | 460 | { |
577 | get | 461 | get { return seedCapability; } |
578 | { | 462 | set { seedCapability = value; } |
579 | return this.seedCapability; | ||
580 | } | ||
581 | set | ||
582 | { | ||
583 | this.seedCapability = value; | ||
584 | } | ||
585 | } // SeedCapability | 463 | } // SeedCapability |
586 | 464 | ||
587 | public string ErrorReason | 465 | public string ErrorReason |
588 | { | 466 | { |
589 | get | 467 | get { return errorReason; } |
590 | { | 468 | set { errorReason = value; } |
591 | return this.errorReason; | ||
592 | } | ||
593 | set | ||
594 | { | ||
595 | this.errorReason = value; | ||
596 | } | ||
597 | } // ErrorReason | 469 | } // ErrorReason |
598 | 470 | ||
599 | public string ErrorMessage | 471 | public string ErrorMessage |
600 | { | 472 | { |
601 | get | 473 | get { return errorMessage; } |
602 | { | 474 | set { errorMessage = value; } |
603 | return this.errorMessage; | ||
604 | } | ||
605 | set | ||
606 | { | ||
607 | this.errorMessage = value; | ||
608 | } | ||
609 | } // ErrorMessage | 475 | } // ErrorMessage |
610 | 476 | ||
611 | public ArrayList InventoryRoot | 477 | public ArrayList InventoryRoot |
612 | { | 478 | { |
613 | get | 479 | get { return inventoryRoot; } |
614 | { | 480 | set { inventoryRoot = value; } |
615 | return this.inventoryRoot; | ||
616 | } | ||
617 | set | ||
618 | { | ||
619 | this.inventoryRoot = value; | ||
620 | } | ||
621 | } | 481 | } |
622 | 482 | ||
623 | public ArrayList InventorySkeleton | 483 | public ArrayList InventorySkeleton |
624 | { | 484 | { |
625 | get | 485 | get { return agentInventory; } |
626 | { | 486 | set { agentInventory = value; } |
627 | return this.agentInventory; | ||
628 | } | ||
629 | set | ||
630 | { | ||
631 | this.agentInventory = value; | ||
632 | } | ||
633 | } | 487 | } |
634 | 488 | ||
635 | public ArrayList InventoryLibrary | 489 | public ArrayList InventoryLibrary |
636 | { | 490 | { |
637 | get | 491 | get { return inventoryLibrary; } |
638 | { | 492 | set { inventoryLibrary = value; } |
639 | return this.inventoryLibrary; | ||
640 | } | ||
641 | set | ||
642 | { | ||
643 | this.inventoryLibrary = value; | ||
644 | } | ||
645 | } | 493 | } |
646 | 494 | ||
647 | public ArrayList InventoryLibraryOwner | 495 | public ArrayList InventoryLibraryOwner |
648 | { | 496 | { |
649 | get | 497 | get { return inventoryLibraryOwner; } |
650 | { | 498 | set { inventoryLibraryOwner = value; } |
651 | return this.inventoryLibraryOwner; | ||
652 | } | ||
653 | set | ||
654 | { | ||
655 | this.inventoryLibraryOwner = value; | ||
656 | } | ||
657 | } | 499 | } |
658 | 500 | ||
659 | public string Home | 501 | public string Home |
660 | { | 502 | { |
661 | get | 503 | get { return home; } |
662 | { | 504 | set { home = value; } |
663 | return this.home; | ||
664 | } | ||
665 | set | ||
666 | { | ||
667 | this.home = value; | ||
668 | } | ||
669 | } | 505 | } |
670 | 506 | ||
671 | public string Message | 507 | public string Message |
672 | { | 508 | { |
673 | get | 509 | get { return welcomeMessage; } |
674 | { | 510 | set { welcomeMessage = value; } |
675 | return this.welcomeMessage; | ||
676 | } | ||
677 | set | ||
678 | { | ||
679 | this.welcomeMessage = value; | ||
680 | } | ||
681 | } | 511 | } |
682 | #endregion | ||
683 | 512 | ||
513 | #endregion | ||
684 | 514 | ||
685 | public class UserInfo | 515 | public class UserInfo |
686 | { | 516 | { |
@@ -691,6 +521,4 @@ namespace OpenSim.Framework.UserManagement | |||
691 | public LLVector3 homelookat; | 521 | public LLVector3 homelookat; |
692 | } | 522 | } |
693 | } | 523 | } |
694 | } | 524 | } \ No newline at end of file |
695 | |||
696 | |||