diff options
author | Justin Clark-Casey (justincc) | 2013-07-08 23:52:40 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-07-08 23:52:40 +0100 |
commit | af9b17c54570a1634d078df0feb8f1b53ffb0726 (patch) | |
tree | bf2b029f1ab66db3999a7f4b1b1d7d094d449690 /OpenSim | |
parent | Add missing file BaseOutputStreamHandler.cs from recent commit e19defd (diff) | |
download | opensim-SC_OLD-af9b17c54570a1634d078df0feb8f1b53ffb0726.zip opensim-SC_OLD-af9b17c54570a1634d078df0feb8f1b53ffb0726.tar.gz opensim-SC_OLD-af9b17c54570a1634d078df0feb8f1b53ffb0726.tar.bz2 opensim-SC_OLD-af9b17c54570a1634d078df0feb8f1b53ffb0726.tar.xz |
minor: remove mono compiler warnings related to keyframe code
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | 9 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs index 8a40278..29652aa 100644 --- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs +++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs | |||
@@ -55,7 +55,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
55 | private object m_lockObject = new object(); | 55 | private object m_lockObject = new object(); |
56 | private object m_timerLock = new object(); | 56 | private object m_timerLock = new object(); |
57 | private const double m_tickDuration = 50.0; | 57 | private const double m_tickDuration = 50.0; |
58 | private Scene m_scene; | ||
59 | 58 | ||
60 | public double TickDuration | 59 | public double TickDuration |
61 | { | 60 | { |
@@ -69,8 +68,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
69 | m_timer.AutoReset = true; | 68 | m_timer.AutoReset = true; |
70 | m_timer.Elapsed += OnTimer; | 69 | m_timer.Elapsed += OnTimer; |
71 | 70 | ||
72 | m_scene = scene; | ||
73 | |||
74 | m_timer.Start(); | 71 | m_timer.Start(); |
75 | } | 72 | } |
76 | 73 | ||
@@ -94,13 +91,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
94 | { | 91 | { |
95 | m.OnTimer(TickDuration); | 92 | m.OnTimer(TickDuration); |
96 | } | 93 | } |
97 | catch (Exception inner) | 94 | catch (Exception) |
98 | { | 95 | { |
99 | // Don't stop processing | 96 | // Don't stop processing |
100 | } | 97 | } |
101 | } | 98 | } |
102 | } | 99 | } |
103 | catch (Exception e) | 100 | catch (Exception) |
104 | { | 101 | { |
105 | // Keep running no matter what | 102 | // Keep running no matter what |
106 | } | 103 | } |
@@ -157,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
157 | [Serializable] | 154 | [Serializable] |
158 | public class KeyframeMotion | 155 | public class KeyframeMotion |
159 | { | 156 | { |
160 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 157 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
161 | 158 | ||
162 | public enum PlayMode : int | 159 | public enum PlayMode : int |
163 | { | 160 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index f287a34..f361acb 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -354,8 +354,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
354 | private UUID m_collisionSound; | 354 | private UUID m_collisionSound; |
355 | private float m_collisionSoundVolume; | 355 | private float m_collisionSoundVolume; |
356 | 356 | ||
357 | private KeyframeMotion m_keyframeMotion = null; | ||
358 | |||
359 | public KeyframeMotion KeyframeMotion | 357 | public KeyframeMotion KeyframeMotion |
360 | { | 358 | { |
361 | get; set; | 359 | get; set; |