From cdb1851f438349a8721c0d9cef54837d0b302189 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 4 Jun 2019 00:50:59 +1000 Subject: Warnings-- --- OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +- OpenSim/Framework/Monitoring/JobEngine.cs | 4 ++-- OpenSim/Framework/Monitoring/Stats/Stat.cs | 2 +- OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | 2 +- OpenSim/Framework/Util.cs | 2 +- OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 +- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++++---- .../Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 2 +- .../CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 2 +- OpenSim/Region/CoreModules/World/Land/LandObject.cs | 3 +-- OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 4 ++-- OpenSim/Region/CoreModules/World/Wind/WindModule.cs | 2 +- OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 6 +++--- OpenSim/Region/Framework/Scenes/SceneManager.cs | 2 +- OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +- .../Scenes/Serialization/CoalescedSceneObjectsSerializer.cs | 2 +- .../Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 +++--- OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs | 2 +- OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs | 2 +- OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 4 ++-- OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs | 2 +- .../Services/Connectors/Neighbour/NeighbourServicesConnector.cs | 2 +- 25 files changed, 35 insertions(+), 36 deletions(-) diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 84d87f1..3d9e07b 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -1934,7 +1934,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController GetSceneFromRegionParams(requestData, responseData, out scene); health = scene.GetHealth(out flags, out text); } - catch (Exception e) + catch /*(Exception e)*/ { responseData["error"] = null; } diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs index 115871e..7264c25 100644 --- a/OpenSim/Framework/Monitoring/JobEngine.cs +++ b/OpenSim/Framework/Monitoring/JobEngine.cs @@ -194,7 +194,7 @@ namespace OpenSim.Framework.Monitoring { if(!IsRunning) return false; - + if(!m_threadRunnig) { WorkManager.RunInThreadPool(ProcessRequests, null, Name, false); @@ -238,7 +238,7 @@ namespace OpenSim.Framework.Monitoring break; } } - catch(ObjectDisposedException e) + catch (ObjectDisposedException) { m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue", Name,m_jobQueue.Count); diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs index 2402acd..2276341 100644 --- a/OpenSim/Framework/Monitoring/Stats/Stat.cs +++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs @@ -245,7 +245,7 @@ namespace OpenSim.Framework.Monitoring ret.Add("Value", OSD.FromReal(Value)); - double lastChangeOverTime, averageChangeOverTime; +// double lastChangeOverTime, averageChangeOverTime; return ret; } diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index fefcb20..60eca5f 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs @@ -126,7 +126,7 @@ namespace OpenSim.Framework.Servers.HttpServer response.OutputStream.Flush(); response.Send(); } - catch (Exception e) + catch { } } diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index a448b31..18d6e4a 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -2691,7 +2691,7 @@ namespace OpenSim.Framework callback(o); } - catch (ThreadAbortException e) + catch (ThreadAbortException) { } catch (Exception e) diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 6f5775a..50b83f6 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs @@ -503,7 +503,7 @@ namespace OpenSim.Region.ClientStack.Linden errorResponse.state = "error"; errorResponse.error = resperror; return errorResponse; - break; +// break; case FileAgentInventoryState.waitUpload: // todo stop current uploader server break; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2ff6ced..edd22a8 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -335,7 +335,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP private readonly byte[] m_channelVersion = Utils.EmptyBytes; private readonly IGroupsModule m_GroupsModule; - private int m_cachedTextureSerial; +// private int m_cachedTextureSerial; private PriorityQueue m_entityUpdates; private PriorityQueue m_entityProps; private Prioritizer m_prioritizer; @@ -344,7 +344,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP // needs optimazation private HashSet GroupsInView = new HashSet(); - private bool m_VelocityInterpolate = false; +// private bool m_VelocityInterpolate = false; private const uint MaxTransferBytesPerPacket = 600; /// @@ -6660,7 +6660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP p.AgentData.AgentID != AgentId) return true; - m_VelocityInterpolate = false; +// m_VelocityInterpolate = false; return true; } @@ -6671,7 +6671,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP p.AgentData.AgentID != AgentId) return true; - m_VelocityInterpolate = true; +// m_VelocityInterpolate = true; return true; } diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 9f52a14..4afac28 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs @@ -369,7 +369,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments { string xmlData; XmlDocument d = null; - UUID asset; +// UUID asset; if (itemData.TryGetValue(attach.ItemID, out xmlData)) { d = new XmlDocument(); diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index f5b575b..84b4707 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs @@ -666,7 +666,7 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest ResponseBody = e.Message; } } - catch (Exception e) + catch (Exception) { // Don't crash on anything else } diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 4471432..ce67fcc 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -1396,9 +1396,8 @@ namespace OpenSim.Region.CoreModules.World.Land byte[] tempConvertArr = new byte[LandBitmap.GetLength(0) * LandBitmap.GetLength(1) / 8]; int tempByte = 0; - int i, byteNum = 0; + int byteNum = 0; int mask = 1; - i = 0; for (int y = 0; y < LandBitmap.GetLength(1); y++) { for (int x = 0; x < LandBitmap.GetLength(0); x++) diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 7b7cce8..fb94853 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -564,7 +564,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap sculpt.Dispose(); } } - catch (Exception e) + catch /*(Exception e)*/ { Vector3 objectPos = prim.ParentGroup.RootPart.AbsolutePosition; //// TODO - print out owner of SceneObjectPart prim. @@ -748,7 +748,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap using (Bitmap img = (Bitmap)imgDecoder.DecodeToImage(asset)) ret = new warp_Texture(img); } - catch (Exception e) + catch /*(Exception e)*/ { m_log.Debug(string.Format("[WARP 3D IMAGE MODULE]: Failed to decode asset {0}, exception ", id)); } diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b1eb0a5..96ba003 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules private uint m_frame = 0; private int m_dataVersion = 0; - private int m_regionID = 0; +// private int m_regionID = 0; private int m_frameUpdateRate = 150; //private Random m_rndnums = new Random(Environment.TickCount); private Scene m_scene = null; diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 80ee510..e2786da 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs @@ -669,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes if (m_group == null) return; - bool update = false; +// bool update = false; if (m_selected) { @@ -724,7 +724,7 @@ namespace OpenSim.Region.Framework.Scenes m_currentFrame.TimeMS += (int)tickDuration; m_lasttickMS = nowMS - 50f; - update = true; +// update = true; } int elapsed = (int)(nowMS - m_lasttickMS); @@ -761,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes else m_group.RootPart.Velocity = Vector3.Zero; } - update = true; +// update = true; } else { diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 1e418df..1fea656 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs @@ -196,7 +196,7 @@ namespace OpenSim.Region.Framework.Scenes public void SendSimOnlineNotification(ulong regionHandle) { - RegionInfo Result = null; +// RegionInfo Result = null; Scene s = m_localScenes.FindValue(delegate(Scene x) { diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 74f765d..8055f92 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs @@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes public class ScenePresence : EntityBase, IScenePresence { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static readonly String LogHeader = "[SCENE PRESENCE]"; +// private static readonly String LogHeader = "[SCENE PRESENCE]"; // ~ScenePresence() // { diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 4024fea..8fa4409 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs @@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization i++; } } - catch (Exception e) + catch /*(Exception e)*/ { m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); //// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index c2b075c..ab70010 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -69,7 +69,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization { return FromOriginalXmlFormat(reader); } - catch (Exception e) + catch /*(Exception e)*/ { m_log.Error("[SERIALIZER]: Deserialization of xml failed "); //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); @@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization // sceneObject.AggregatePerms(); return sceneObject; } - catch (Exception e) + catch /*(Exception e)*/ { m_log.Error("[SERIALIZER]: Deserialization of xml failed "); //// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); @@ -1402,7 +1402,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization value = reader.ReadElementContentAsString("Media", String.Empty); shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); } - catch (XmlException e) + catch (XmlException) { // There are versions of OAR files that contain unquoted XML. // ie ONE comercial fork that never wanted their oars to be read by our code diff --git a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs index 2a1ae45..29685da 100644 --- a/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs +++ b/OpenSim/Region/PhysicsModules/BasicPhysics/BasicPhysicsScene.cs @@ -163,7 +163,7 @@ namespace OpenSim.Region.PhysicsModule.BasicPhysics { // Console.WriteLine("Simulating"); - float fps = 0; +// float fps = 0; for (int i = 0; i < _actors.Count; ++i) { BasicActor actor = _actors[i]; diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs index d182c34..6b32bf8 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSCharacter.cs @@ -56,7 +56,7 @@ public sealed class BSCharacter : BSPhysObject private float _buoyancy; private OMV.Vector3 _size; - private float _footOffset; + private float _footOffset = 0; private BSActorAvatarMove m_moveActor; private const string AvatarMoveActorName = "BSCharacter.AvatarMove"; diff --git a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs index bfa95c1..a6f587e 100644 --- a/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/Tests/Raycast.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.PhysicsModule.BulletS.Tests BSScene _physicsScene { get; set; } BSPrim _targetSphere { get; set; } Vector3 _targetSpherePosition { get; set; } - float _simulationTimeStep = 0.089f; +// float _simulationTimeStep = 0.089f; uint _targetLocalID = 123; diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index 49559bf..99c43b4 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -1383,7 +1383,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing { File.Delete(filename); } - catch (IOException e) + catch (IOException) { m_log.ErrorFormat( "[MESH CACHE]: Failed to delete file {0}",filename); @@ -1596,7 +1596,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing return false; } - return false; +// return false; } } } diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index 66210b7..9dc8d05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs @@ -19720,7 +19720,7 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool case 1076: ; break; case 1032: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } - break; +// break; case 1067: ; break; case 1072: ; diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 9d72b1c..5342c28 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs @@ -771,7 +771,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance /// public object EventProcessor() { - EventParams data = null; +// EventParams data = null; // We check here as the thread stopping this instance from running may itself hold the m_Script lock. if (!Running) return 0; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs index 241a24d..8ceb4cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs @@ -157,7 +157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests using (HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse()) {} } - catch (WebException e) + catch (WebException) { // using (HttpWebResponse response = (HttpWebResponse)e.Response) // gotExpectedException = response.StatusCode == HttpStatusCode.NotFound; diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs index 5f075ac..33b3866 100644 --- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs +++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs @@ -151,7 +151,7 @@ namespace OpenSim.Services.Connectors os.Write(buffer, 0, strBuffer.Length); //Send it //m_log.InfoFormat("[REST COMMS]: Posted HelloNeighbour request to remote sim {0}", uri); } - catch (Exception e) + catch (Exception /*e*/) { // m_log.WarnFormat( // "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}", -- cgit v1.1