minor: remove mono compiler warnings related to keyframe code
parent
2025dd25f6
commit
af9b17c545
|
@ -55,7 +55,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
private object m_lockObject = new object();
|
private object m_lockObject = new object();
|
||||||
private object m_timerLock = new object();
|
private object m_timerLock = new object();
|
||||||
private const double m_tickDuration = 50.0;
|
private const double m_tickDuration = 50.0;
|
||||||
private Scene m_scene;
|
|
||||||
|
|
||||||
public double TickDuration
|
public double TickDuration
|
||||||
{
|
{
|
||||||
|
@ -69,8 +68,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
m_timer.AutoReset = true;
|
m_timer.AutoReset = true;
|
||||||
m_timer.Elapsed += OnTimer;
|
m_timer.Elapsed += OnTimer;
|
||||||
|
|
||||||
m_scene = scene;
|
|
||||||
|
|
||||||
m_timer.Start();
|
m_timer.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -94,13 +91,13 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
{
|
{
|
||||||
m.OnTimer(TickDuration);
|
m.OnTimer(TickDuration);
|
||||||
}
|
}
|
||||||
catch (Exception inner)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
// Don't stop processing
|
// Don't stop processing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
// Keep running no matter what
|
// Keep running no matter what
|
||||||
}
|
}
|
||||||
|
@ -157,7 +154,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class KeyframeMotion
|
public class KeyframeMotion
|
||||||
{
|
{
|
||||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
|
|
||||||
public enum PlayMode : int
|
public enum PlayMode : int
|
||||||
{
|
{
|
||||||
|
|
|
@ -354,8 +354,6 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
private UUID m_collisionSound;
|
private UUID m_collisionSound;
|
||||||
private float m_collisionSoundVolume;
|
private float m_collisionSoundVolume;
|
||||||
|
|
||||||
private KeyframeMotion m_keyframeMotion = null;
|
|
||||||
|
|
||||||
public KeyframeMotion KeyframeMotion
|
public KeyframeMotion KeyframeMotion
|
||||||
{
|
{
|
||||||
get; set;
|
get; set;
|
||||||
|
|
Loading…
Reference in New Issue