aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/CAPSService.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs2
-rw-r--r--OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs2
-rw-r--r--OpenSim/Framework/Communications/IInventoryServices.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginResponse.cs66
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs2
14 files changed, 46 insertions, 46 deletions
diff --git a/OpenSim/Framework/Communications/CAPSService.cs b/OpenSim/Framework/Communications/CAPSService.cs
index 9cb04a9..ada1405 100644
--- a/OpenSim/Framework/Communications/CAPSService.cs
+++ b/OpenSim/Framework/Communications/CAPSService.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index b3d3c7c..a164e11 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
index e611eea..4a69097 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadRequest.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
index 7744ffb..5d6b7bd 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDAssetUploadResponse.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
index 7006b44..6bec162 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDCapsDetails.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
index 3842058..e400877 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDItemUpdate.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
index 935f81d..15369ff 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMapRequest.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
index 6bd47e1..e8eefc0 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDMethod.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
index 4321d7b..288bf2c 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDStreamHandler.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
index 52e13a7..329ab8e 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSDTaskScriptUpdate.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs
index 0e09613..0ad6fd6 100644
--- a/OpenSim/Framework/Communications/IInventoryServices.cs
+++ b/OpenSim/Framework/Communications/IInventoryServices.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index c8748fa..ec20850 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index baf07e8..715bc52 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
@@ -129,7 +129,7 @@ namespace OpenSim.Framework.UserManagement
129 defaultXmlRpcResponse = new XmlRpcResponse(); 129 defaultXmlRpcResponse = new XmlRpcResponse();
130 130
131 SetDefaultValues(); 131 SetDefaultValues();
132 } // LoginServer 132 }
133 133
134 public void SetDefaultValues() 134 public void SetDefaultValues()
135 { 135 {
@@ -180,7 +180,7 @@ namespace OpenSim.Framework.UserManagement
180 InitialOutfitHash["folder_name"] = "Nightclub Female"; 180 InitialOutfitHash["folder_name"] = "Nightclub Female";
181 InitialOutfitHash["gender"] = "female"; 181 InitialOutfitHash["gender"] = "female";
182 initialOutfit.Add(InitialOutfitHash); 182 initialOutfit.Add(InitialOutfitHash);
183 } // SetDefaultValues 183 }
184 184
185 #region Login Failure Methods 185 #region Login Failure Methods
186 186
@@ -198,7 +198,7 @@ namespace OpenSim.Framework.UserManagement
198 loginError["login"] = login; 198 loginError["login"] = login;
199 xmlRpcResponse.Value = loginError; 199 xmlRpcResponse.Value = loginError;
200 return (xmlRpcResponse); 200 return (xmlRpcResponse);
201 } // GenerateResponse 201 }
202 202
203 public LLSD GenerateFailureResponseLLSD(string reason, string message, string login) 203 public LLSD GenerateFailureResponseLLSD(string reason, string message, string login)
204 { 204 {
@@ -218,7 +218,7 @@ namespace OpenSim.Framework.UserManagement
218 public XmlRpcResponse CreateFailedResponse() 218 public XmlRpcResponse CreateFailedResponse()
219 { 219 {
220 return (CreateLoginFailedResponse()); 220 return (CreateLoginFailedResponse());
221 } // CreateErrorConnectingToGridResponse() 221 }
222 222
223 public LLSD CreateFailedResponseLLSD() 223 public LLSD CreateFailedResponseLLSD()
224 { 224 {
@@ -231,7 +231,7 @@ namespace OpenSim.Framework.UserManagement
231 (GenerateFailureResponse("key", 231 (GenerateFailureResponse("key",
232 "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.", 232 "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
233 "false")); 233 "false"));
234 } // LoginFailedResponse 234 }
235 235
236 public LLSD CreateLoginFailedResponseLLSD() 236 public LLSD CreateLoginFailedResponseLLSD()
237 { 237 {
@@ -247,7 +247,7 @@ namespace OpenSim.Framework.UserManagement
247 (GenerateFailureResponse("presence", 247 (GenerateFailureResponse("presence",
248 "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", 248 "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",
249 "false")); 249 "false"));
250 } // CreateAlreadyLoggedInResponse() 250 }
251 251
252 public LLSD CreateAlreadyLoggedInResponseLLSD() 252 public LLSD CreateAlreadyLoggedInResponseLLSD()
253 { 253 {
@@ -368,7 +368,7 @@ namespace OpenSim.Framework.UserManagement
368 368
369 return (GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); 369 return (GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
370 } 370 }
371 } // ToXmlRpcResponse 371 }
372 372
373 public LLSD ToLLSDResponse() 373 public LLSD ToLLSDResponse()
374 { 374 {
@@ -478,12 +478,12 @@ namespace OpenSim.Framework.UserManagement
478 { 478 {
479 // this.eventCategoriesHash[category] = value; 479 // this.eventCategoriesHash[category] = value;
480 //TODO 480 //TODO
481 } // SetEventCategories 481 }
482 482
483 public void AddToUIConfig(string itemName, string item) 483 public void AddToUIConfig(string itemName, string item)
484 { 484 {
485 uiConfigHash[itemName] = item; 485 uiConfigHash[itemName] = item;
486 } // SetUIConfig 486 }
487 487
488 public void AddClassifiedCategory(Int32 ID, string categoryName) 488 public void AddClassifiedCategory(Int32 ID, string categoryName)
489 { 489 {
@@ -492,7 +492,7 @@ namespace OpenSim.Framework.UserManagement
492 hash["category_id"] = ID; 492 hash["category_id"] = ID;
493 classifiedCategories.Add(hash); 493 classifiedCategories.Add(hash);
494 // this.classifiedCategoriesHash.Clear(); 494 // this.classifiedCategoriesHash.Clear();
495 } // SetClassifiedCategory 495 }
496 496
497 #region Properties 497 #region Properties
498 498
@@ -500,109 +500,109 @@ namespace OpenSim.Framework.UserManagement
500 { 500 {
501 get { return login; } 501 get { return login; }
502 set { login = value; } 502 set { login = value; }
503 } // Login 503 }
504 504
505 public string DST 505 public string DST
506 { 506 {
507 get { return dst; } 507 get { return dst; }
508 set { dst = value; } 508 set { dst = value; }
509 } // DST 509 }
510 510
511 public string StipendSinceLogin 511 public string StipendSinceLogin
512 { 512 {
513 get { return stipendSinceLogin; } 513 get { return stipendSinceLogin; }
514 set { stipendSinceLogin = value; } 514 set { stipendSinceLogin = value; }
515 } // StipendSinceLogin 515 }
516 516
517 public string Gendered 517 public string Gendered
518 { 518 {
519 get { return gendered; } 519 get { return gendered; }
520 set { gendered = value; } 520 set { gendered = value; }
521 } // Gendered 521 }
522 522
523 public string EverLoggedIn 523 public string EverLoggedIn
524 { 524 {
525 get { return everLoggedIn; } 525 get { return everLoggedIn; }
526 set { everLoggedIn = value; } 526 set { everLoggedIn = value; }
527 } // EverLoggedIn 527 }
528 528
529 public uint SimPort 529 public uint SimPort
530 { 530 {
531 get { return simPort; } 531 get { return simPort; }
532 set { simPort = value; } 532 set { simPort = value; }
533 } // SimPort 533 }
534 534
535 public string SimAddress 535 public string SimAddress
536 { 536 {
537 get { return simAddress; } 537 get { return simAddress; }
538 set { simAddress = value; } 538 set { simAddress = value; }
539 } // SimAddress 539 }
540 540
541 public LLUUID AgentID 541 public LLUUID AgentID
542 { 542 {
543 get { return agentID; } 543 get { return agentID; }
544 set { agentID = value; } 544 set { agentID = value; }
545 } // AgentID 545 }
546 546
547 public LLUUID SessionID 547 public LLUUID SessionID
548 { 548 {
549 get { return sessionID; } 549 get { return sessionID; }
550 set { sessionID = value; } 550 set { sessionID = value; }
551 } // SessionID 551 }
552 552
553 public LLUUID SecureSessionID 553 public LLUUID SecureSessionID
554 { 554 {
555 get { return secureSessionID; } 555 get { return secureSessionID; }
556 set { secureSessionID = value; } 556 set { secureSessionID = value; }
557 } // SecureSessionID 557 }
558 558
559 public Int32 CircuitCode 559 public Int32 CircuitCode
560 { 560 {
561 get { return circuitCode; } 561 get { return circuitCode; }
562 set { circuitCode = value; } 562 set { circuitCode = value; }
563 } // CircuitCode 563 }
564 564
565 public uint RegionX 565 public uint RegionX
566 { 566 {
567 get { return regionX; } 567 get { return regionX; }
568 set { regionX = value; } 568 set { regionX = value; }
569 } // RegionX 569 }
570 570
571 public uint RegionY 571 public uint RegionY
572 { 572 {
573 get { return regionY; } 573 get { return regionY; }
574 set { regionY = value; } 574 set { regionY = value; }
575 } // RegionY 575 }
576 576
577 public string SunTexture 577 public string SunTexture
578 { 578 {
579 get { return sunTexture; } 579 get { return sunTexture; }
580 set { sunTexture = value; } 580 set { sunTexture = value; }
581 } // SunTexture 581 }
582 582
583 public string CloudTexture 583 public string CloudTexture
584 { 584 {
585 get { return cloudTexture; } 585 get { return cloudTexture; }
586 set { cloudTexture = value; } 586 set { cloudTexture = value; }
587 } // CloudTexture 587 }
588 588
589 public string MoonTexture 589 public string MoonTexture
590 { 590 {
591 get { return moonTexture; } 591 get { return moonTexture; }
592 set { moonTexture = value; } 592 set { moonTexture = value; }
593 } // MoonTexture 593 }
594 594
595 public string Firstname 595 public string Firstname
596 { 596 {
597 get { return firstname; } 597 get { return firstname; }
598 set { firstname = value; } 598 set { firstname = value; }
599 } // Firstname 599 }
600 600
601 public string Lastname 601 public string Lastname
602 { 602 {
603 get { return lastname; } 603 get { return lastname; }
604 set { lastname = value; } 604 set { lastname = value; }
605 } // Lastname 605 }
606 606
607 public string AgentAccess 607 public string AgentAccess
608 { 608 {
@@ -614,7 +614,7 @@ namespace OpenSim.Framework.UserManagement
614 { 614 {
615 get { return startLocation; } 615 get { return startLocation; }
616 set { startLocation = value; } 616 set { startLocation = value; }
617 } // StartLocation 617 }
618 618
619 public string LookAt 619 public string LookAt
620 { 620 {
@@ -626,19 +626,19 @@ namespace OpenSim.Framework.UserManagement
626 { 626 {
627 get { return seedCapability; } 627 get { return seedCapability; }
628 set { seedCapability = value; } 628 set { seedCapability = value; }
629 } // SeedCapability 629 }
630 630
631 public string ErrorReason 631 public string ErrorReason
632 { 632 {
633 get { return errorReason; } 633 get { return errorReason; }
634 set { errorReason = value; } 634 set { errorReason = value; }
635 } // ErrorReason 635 }
636 636
637 public string ErrorMessage 637 public string ErrorMessage
638 { 638 {
639 get { return errorMessage; } 639 get { return errorMessage; }
640 set { errorMessage = value; } 640 set { errorMessage = value; }
641 } // ErrorMessage 641 }
642 642
643 public ArrayList InventoryRoot 643 public ArrayList InventoryRoot
644 { 644 {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e14eccf..3bf6096 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -13,7 +13,7 @@
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS AS IS AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY