From cdb1851f438349a8721c0d9cef54837d0b302189 Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 4 Jun 2019 00:50:59 +1000 Subject: Warnings-- --- 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 +- .../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Framework') 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 -- cgit v1.1