OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug fix

avinationmerge
UbitUmarov 2014-10-26 12:24:12 +00:00
parent b43ce909aa
commit 525322efa2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
View File

@ -785,6 +785,11 @@ namespace OpenSim.Region.Framework.Scenes
public Byte[] Serialize() public Byte[] Serialize()
{ {
bool timerWasStopped;
lock (m_frames)
{
timerWasStopped = m_timerStopped;
}
StopTimer(); StopTimer();
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
@ -795,7 +800,7 @@ namespace OpenSim.Region.Framework.Scenes
m_serializedPosition = tmp.AbsolutePosition; m_serializedPosition = tmp.AbsolutePosition;
fmt.Serialize(ms, this); fmt.Serialize(ms, this);
m_group = tmp; m_group = tmp;
if (m_running && !m_waitingCrossing) if (!timerWasStopped && m_running && !m_waitingCrossing)
StartTimer(); StartTimer();
return ms.ToArray(); return ms.ToArray();