From be7ae3dd3ecddc46390f40c0315ff84703c32e7a Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Tue, 4 Dec 2007 08:18:09 +0000 Subject: * Removed 12 compiler warnings. --- OpenSim/Framework/Communications/LoginService.cs | 1 - OpenSim/Framework/Console/LogBase.cs | 2 +- OpenSim/Grid/UserServer/UserLoginService.cs | 2 +- OpenSim/Region/ClientStack/UDPServer.cs | 2 +- OpenSim/Region/Communications/OGS1/OGS1GridServices.cs | 4 +--- OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 1 - OpenSim/Region/Environment/Scenes/InnerScene.cs | 2 -- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 1 - OpenSim/Region/Environment/Scenes/ScenePresence.cs | 1 - .../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 1 - 11 files changed, 5 insertions(+), 14 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index 4c33bd8..e7441b8 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs @@ -178,7 +178,6 @@ namespace OpenSim.Framework.UserManagement { m_loginMutex.ReleaseMutex(); } - return null; } /// diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs index ec3c5bc..6c97768 100644 --- a/OpenSim/Framework/Console/LogBase.cs +++ b/OpenSim/Framework/Console/LogBase.cs @@ -244,7 +244,7 @@ namespace OpenSim.Framework.Console Log.Flush(); } - catch (FormatException FE) + catch (FormatException) { System.Console.WriteLine(args); } diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index 13f8350..ef4b82d 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -118,7 +118,7 @@ namespace OpenSim.Grid.UserServer XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); } - catch (Exception e) + catch (Exception) { tryDefault = true; } diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index 8f377c1..b0586a3 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs @@ -125,7 +125,7 @@ namespace OpenSim.Region.ClientStack return; } - catch (System.ObjectDisposedException od) + catch (System.ObjectDisposedException) { return; } diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index 16e5d93..f4e858b 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -645,8 +645,6 @@ namespace OpenSim.Region.Communications.OGS1 MainLog.Instance.Debug(e.ToString()); return false; } - - return true; } /// /// @@ -857,7 +855,7 @@ namespace OpenSim.Region.Communications.OGS1 { return m_localBackend.IncomingChildAgent(regionHandle, agentData); } - catch (RemotingException e) + catch (RemotingException) { //MainLog.Instance.Error("Remoting Error: Unable to connect to adjacent region.\n" + e.ToString()); return false; diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index 9e1206b..b841154 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -165,7 +165,6 @@ namespace OpenSim.Region.Communications.OGS1 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) { throw new Exception("The method or operation is not implemented."); - return LLUUID.Zero; } } } \ No newline at end of file diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index bdcd840..cceaa14 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -292,7 +292,6 @@ namespace OpenSim.Region.Environment.Scenes public EntityIntersection GetClosestIntersectingPrim(Ray hray) { // Primitive Ray Tracing - bool gothit = false; float closestDistance = 280f; EntityIntersection returnResult = new EntityIntersection(); foreach (EntityBase ent in Entities.Values) @@ -305,7 +304,6 @@ namespace OpenSim.Region.Environment.Scenes { if (result.distance < closestDistance) { - gothit = true; closestDistance = result.distance; returnResult = result; } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 8fc04c4..e671038 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1068,7 +1068,7 @@ namespace OpenSim.Region.Environment.Scenes { avatar.Close(); } - catch (System.NullReferenceException NE) + catch (System.NullReferenceException) { //We can safely ignore null reference exceptions. It means the avatar are dead and cleaned up anyway. diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 99dafac..543a468 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs @@ -956,7 +956,6 @@ namespace OpenSim.Region.Environment.Scenes public void UpdatePrimFlags(ushort type, bool inUse, byte[] data) { - bool hasPrim = false; bool usePhysics = false; bool IsTemporary = false; bool IsPhantom = false; diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 145e15a..abfa250 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -54,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes private uint m_requestedSitTargetID = 0; private LLVector3 m_requestedSitOffset = new LLVector3(); private float m_sitAvatarHeight = 2.0f; - private bool m_oldColliding = true; private bool m_isTyping = false; private bool m_setAlwaysRun = false; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs index aa35c4c..e72f8f5 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs @@ -222,7 +222,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler LSL_Types.Quaternion a1 = new LSL_Types.Quaternion(0.0, 0.0, cz, cw); LSL_Types.Quaternion a2 = new LSL_Types.Quaternion(0.0, by, 0.0, bw); LSL_Types.Quaternion a3 = new LSL_Types.Quaternion(ax, 0.0, 0.0, aw); - LSL_Types.Quaternion a = new LSL_Types.Quaternion(); //This multiplication doesnt compile, yet. a = a1 * a2 * a3; LSL_Types.Quaternion b = new LSL_Types.Quaternion(ax*bw*cw + aw*by*cz, aw*by*cw - ax*bw*cz, aw*bw*cz + ax*by*cw, -- cgit v1.1