OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: remove some mono compiler warnings

0.6.5-rc1
Justin Clarke Casey 2009-03-09 19:58:39 +00:00
parent ae759f2d06
commit 051096e8ae
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -496,21 +496,20 @@ namespace OpenSim.Client.MXP.ClientStack
return new Vector3(vector.X, vector.Y, vector.Z); return new Vector3(vector.X, vector.Y, vector.Z);
} }
// private Vector3 FromOmVector(float[] vector)
private Vector3 FromOmVector(float[] vector) // {
{ // return new Vector3(vector[0], vector[1], vector[2]);
return new Vector3(vector[0], vector[1], vector[2]); // }
}
private Quaternion FromOmQuaternion(MsdQuaternion4f quaternion) private Quaternion FromOmQuaternion(MsdQuaternion4f quaternion)
{ {
return new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W); return new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
} }
private Quaternion FromOmQuaternion(float[] quaternion) // private Quaternion FromOmQuaternion(float[] quaternion)
{ // {
return new Quaternion(quaternion[0], quaternion[1], quaternion[2], quaternion[3]); // return new Quaternion(quaternion[0], quaternion[1], quaternion[2], quaternion[3]);
} // }
private MsdColor4f ToOmColor(byte[] value) private MsdColor4f ToOmColor(byte[] value)
{ {

8
OpenSim/Framework/Communications/LoginService.cs
View File

@ -580,10 +580,10 @@ namespace OpenSim.Framework.Communications
m_userManager.StoreWebLoginKey(user.ID, webloginkey); m_userManager.StoreWebLoginKey(user.ID, webloginkey);
//statuscode = 301; //statuscode = 301;
string redirectURL = "about:blank?redirect-http-hack=" + // string redirectURL = "about:blank?redirect-http-hack=" +
HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" + // HttpUtility.UrlEncode("secondlife:///app/login?first_name=" + firstname + "&last_name=" +
lastname + // lastname +
"&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString()); // "&location=" + location + "&grid=Other&web_login_key=" + webloginkey.ToString());
//m_log.Info("[WEB]: R:" + redirectURL); //m_log.Info("[WEB]: R:" + redirectURL);
returnactions["int_response_code"] = statuscode; returnactions["int_response_code"] = statuscode;
//returnactions["str_redirect_location"] = redirectURL; //returnactions["str_redirect_location"] = redirectURL;

2
OpenSim/Framework/Communications/Tests/Cache/AssetCacheTests.cs
View File

@ -44,10 +44,10 @@ namespace OpenSim.Framework.Communications.Tests
protected UUID m_assetIdReceived; protected UUID m_assetIdReceived;
protected AssetBase m_assetReceived; protected AssetBase m_assetReceived;
[Test]
/// <summary> /// <summary>
/// Test the 'asynchronous' get asset mechanism (though this won't be done asynchronously within this test) /// Test the 'asynchronous' get asset mechanism (though this won't be done asynchronously within this test)
/// </summary> /// </summary>
[Test]
public void TestGetAsset() public void TestGetAsset()
{ {
UUID assetId = UUID.Parse("00000000-0000-0000-0000-000000000001"); UUID assetId = UUID.Parse("00000000-0000-0000-0000-000000000001");

2
OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs
View File

@ -519,7 +519,7 @@ namespace OpenSim.Region.Framework.Scenes
//m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue //m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue
//0-1 //0-1
float difference = upper - lower; // float difference = upper - lower;
// we're trying to get a zero lower and modify all values equally so we get a percentage position // we're trying to get a zero lower and modify all values equally so we get a percentage position
if (lower > 0) if (lower > 0)
{ {