diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 10 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 1c72b79..e8e0559 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -579,11 +579,11 @@ namespace OpenSim.Framework.Communications | |||
579 | UUID webloginkey = UUID.Random(); | 579 | UUID webloginkey = UUID.Random(); |
580 | m_userManager.StoreWebLoginKey(user.ID, webloginkey); | 580 | m_userManager.StoreWebLoginKey(user.ID, webloginkey); |
581 | //statuscode = 301; | 581 | //statuscode = 301; |
582 | 582 | ||
583 | string redirectURL = "about:blank?redirect-http-hack=" + | 583 | // string redirectURL = "about:blank?redirect-http-hack=" + |
584 | HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + | 584 | // HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + |
585 | lastname + | 585 | // lastname + |
586 | "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); | 586 | // "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); |
587 | //m_log.Info("[WEB]: R:" + redirectURL); | 587 | //m_log.Info("[WEB]: R:" + redirectURL); |
588 | returnactions["int_response_code"] = statuscode; | 588 | returnactions["int_response_code"] = statuscode; |
589 | //returnactions["str_redirect_location"] = redirectURL; | 589 | //returnactions["str_redirect_location"] = redirectURL; |
diff --git a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs index 34193b5..18ae9a7 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs | |||
@@ -43,11 +43,11 @@ namespace OpenSim.Framework.Communications.Tests | |||
43 | { | 43 | { |
44 | protected UUID m_assetIdReceived; | 44 | protected UUID m_assetIdReceived; |
45 | protected AssetBase m_assetReceived; | 45 | protected AssetBase m_assetReceived; |
46 | 46 | ||
47 | [Test] | ||
48 | /// <summary> | 47 | /// <summary> |
49 | /// Test the 'asynchronous' get asset mechanism (though this won't be done asynchronously within this test) | 48 | /// Test the 'asynchronous' get asset mechanism (though this won't be done asynchronously within this test) |
50 | /// </summary> | 49 | /// </summary> |
50 | [Test] | ||
51 | public void TestGetAsset() | 51 | public void TestGetAsset() |
52 | { | 52 | { |
53 | UUID assetId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 53 | UUID assetId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |