diff options
4 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index 5d08eb0..6b8c09f 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
@@ -496,21 +496,20 @@ namespace OpenSim.Client.MXP.ClientStack | |||
496 | return new Vector3(vector.X, vector.Y, vector.Z); | 496 | return new Vector3(vector.X, vector.Y, vector.Z); |
497 | } | 497 | } |
498 | 498 | ||
499 | 499 | // private Vector3 FromOmVector(float[] vector) | |
500 | private Vector3 FromOmVector(float[] vector) | 500 | // { |
501 | { | 501 | // return new Vector3(vector[0], vector[1], vector[2]); |
502 | return new Vector3(vector[0], vector[1], vector[2]); | 502 | // } |
503 | } | ||
504 | 503 | ||
505 | private Quaternion FromOmQuaternion(MsdQuaternion4f quaternion) | 504 | private Quaternion FromOmQuaternion(MsdQuaternion4f quaternion) |
506 | { | 505 | { |
507 | return new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W); | 506 | return new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W); |
508 | } | 507 | } |
509 | 508 | ||
510 | private Quaternion FromOmQuaternion(float[] quaternion) | 509 | // private Quaternion FromOmQuaternion(float[] quaternion) |
511 | { | 510 | // { |
512 | return new Quaternion(quaternion[0], quaternion[1], quaternion[2], quaternion[3]); | 511 | // return new Quaternion(quaternion[0], quaternion[1], quaternion[2], quaternion[3]); |
513 | } | 512 | // } |
514 | 513 | ||
515 | private MsdColor4f ToOmColor(byte[] value) | 514 | private MsdColor4f ToOmColor(byte[] value) |
516 | { | 515 | { |
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"); |
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs index 54f6d68..a684461 100644 --- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs +++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs | |||
@@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
519 | //m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue | 519 | //m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue |
520 | //0-1 | 520 | //0-1 |
521 | 521 | ||
522 | float difference = upper - lower; | 522 | // float difference = upper - lower; |
523 | // we're trying to get a zero lower and modify all values equally so we get a percentage position | 523 | // we're trying to get a zero lower and modify all values equally so we get a percentage position |
524 | if (lower > 0) | 524 | if (lower > 0) |
525 | { | 525 | { |