aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-08-29 11:46:57 +0200
committerMelanie2012-08-29 11:46:57 +0200
commitf7a60261e9f987ac5c1a1666a2a8ebef2f13c33d (patch)
tree32cb53e053ade4561ab1ab867bb4f9803d99ca4a
parentMake llCollisionSprite not throw anymore (diff)
parentFix issue with the quit packet being stuck int he queue and a one packet delay. (diff)
downloadopensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.zip
opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.gz
opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.bz2
opensim-SC-f7a60261e9f987ac5c1a1666a2a8ebef2f13c33d.tar.xz
Merge branch 'ubitwork' into avination
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs137
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs12
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs522
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs30
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
8 files changed, 565 insertions, 151 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 7042c9a..75a47d5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -110,7 +110,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
110 /// <summary>Handlers for incoming packets</summary> 110 /// <summary>Handlers for incoming packets</summary>
111 //PacketEventDictionary packetEvents = new PacketEventDictionary(); 111 //PacketEventDictionary packetEvents = new PacketEventDictionary();
112 /// <summary>Incoming packets that are awaiting handling</summary> 112 /// <summary>Incoming packets that are awaiting handling</summary>
113 private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>(); 113 //private OpenMetaverse.BlockingQueue<IncomingPacket> packetInbox = new OpenMetaverse.BlockingQueue<IncomingPacket>();
114
115 private DoubleQueue<IncomingPacket> packetInbox = new DoubleQueue<IncomingPacket>();
116
114 /// <summary></summary> 117 /// <summary></summary>
115 //private UDPClientCollection m_clients = new UDPClientCollection(); 118 //private UDPClientCollection m_clients = new UDPClientCollection();
116 /// <summary>Bandwidth throttle for this UDP server</summary> 119 /// <summary>Bandwidth throttle for this UDP server</summary>
@@ -919,7 +922,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
919 #endregion Ping Check Handling 922 #endregion Ping Check Handling
920 923
921 // Inbox insertion 924 // Inbox insertion
922 packetInbox.Enqueue(new IncomingPacket((LLClientView)client, packet)); 925 if (packet.Type == PacketType.AgentUpdate ||
926 packet.Type == PacketType.ChatFromViewer)
927 packetInbox.EnqueueHigh(new IncomingPacket((LLClientView)client, packet));
928 else
929 packetInbox.EnqueueLow(new IncomingPacket((LLClientView)client, packet));
923 } 930 }
924 931
925 #region BinaryStats 932 #region BinaryStats
@@ -1471,8 +1478,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1471 Packet packet = incomingPacket.Packet; 1478 Packet packet = incomingPacket.Packet;
1472 LLClientView client = incomingPacket.Client; 1479 LLClientView client = incomingPacket.Client;
1473 1480
1474 if (client.IsActive) 1481// if (client.IsActive)
1475 { 1482// {
1476 m_currentIncomingClient = client; 1483 m_currentIncomingClient = client;
1477 1484
1478 try 1485 try
@@ -1499,13 +1506,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1499 { 1506 {
1500 m_currentIncomingClient = null; 1507 m_currentIncomingClient = null;
1501 } 1508 }
1502 } 1509// }
1503 else 1510// else
1504 { 1511// {
1505 m_log.DebugFormat( 1512// m_log.DebugFormat(
1506 "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}", 1513// "[LLUDPSERVER]: Dropped incoming {0} for dead client {1} in {2}",
1507 packet.Type, client.Name, m_scene.RegionInfo.RegionName); 1514// packet.Type, client.Name, m_scene.RegionInfo.RegionName);
1508 } 1515// }
1509 } 1516 }
1510 1517
1511 protected void LogoutHandler(IClientAPI client) 1518 protected void LogoutHandler(IClientAPI client)
@@ -1519,4 +1526,112 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1519 } 1526 }
1520 } 1527 }
1521 } 1528 }
1529
1530 internal class DoubleQueue<T> where T:class
1531 {
1532 private Queue<T> m_lowQueue = new Queue<T>();
1533 private Queue<T> m_highQueue = new Queue<T>();
1534
1535 private object m_syncRoot = new object();
1536 private Semaphore m_s = new Semaphore(0, 1);
1537
1538 public DoubleQueue()
1539 {
1540 }
1541
1542 public virtual int Count
1543 {
1544 get { return m_highQueue.Count + m_lowQueue.Count; }
1545 }
1546
1547 public virtual void Enqueue(T data)
1548 {
1549 Enqueue(m_lowQueue, data);
1550 }
1551
1552 public virtual void EnqueueLow(T data)
1553 {
1554 Enqueue(m_lowQueue, data);
1555 }
1556
1557 public virtual void EnqueueHigh(T data)
1558 {
1559 Enqueue(m_highQueue, data);
1560 }
1561
1562 private void Enqueue(Queue<T> q, T data)
1563 {
1564 lock (m_syncRoot)
1565 {
1566 m_lowQueue.Enqueue(data);
1567 m_s.WaitOne(0);
1568 m_s.Release();
1569 }
1570 }
1571
1572 public virtual T Dequeue()
1573 {
1574 return Dequeue(Timeout.Infinite);
1575 }
1576
1577 public virtual T Dequeue(int tmo)
1578 {
1579 return Dequeue(TimeSpan.FromMilliseconds(tmo));
1580 }
1581
1582 public virtual T Dequeue(TimeSpan wait)
1583 {
1584 T res = null;
1585
1586 if (!Dequeue(wait, ref res))
1587 return null;
1588
1589 return res;
1590 }
1591
1592 public bool Dequeue(int timeout, ref T res)
1593 {
1594 return Dequeue(TimeSpan.FromMilliseconds(timeout), ref res);
1595 }
1596
1597 public bool Dequeue(TimeSpan wait, ref T res)
1598 {
1599 if (!m_s.WaitOne(wait))
1600 return false;
1601
1602 lock (m_syncRoot)
1603 {
1604 if (m_highQueue.Count > 0)
1605 res = m_highQueue.Dequeue();
1606 else
1607 res = m_lowQueue.Dequeue();
1608
1609 if (m_highQueue.Count == 0 && m_lowQueue.Count == 0)
1610 return true;
1611
1612 try
1613 {
1614 m_s.Release();
1615 }
1616 catch
1617 {
1618 }
1619
1620 return true;
1621 }
1622 }
1623
1624 public virtual void Clear()
1625 {
1626
1627 lock (m_syncRoot)
1628 {
1629 // Make sure sem count is 0
1630 m_s.WaitOne(0);
1631
1632 m_lowQueue.Clear();
1633 m_highQueue.Clear();
1634 }
1635 }
1636 }
1522} 1637}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 560f807..9ffb851 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1855,6 +1855,9 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1855 if (grp.RootPart.PhysActor != null) 1855 if (grp.RootPart.PhysActor != null)
1856 grp.RootPart.PhysActor.CrossingFailure(); 1856 grp.RootPart.PhysActor.CrossingFailure();
1857 1857
1858 if (grp.RootPart.KeyframeMotion != null)
1859 grp.RootPart.KeyframeMotion.CrossingFailure();
1860
1858 grp.ScheduleGroupForFullUpdate(); 1861 grp.ScheduleGroupForFullUpdate();
1859 } 1862 }
1860 1863
@@ -1910,8 +1913,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1910 grp, e); 1913 grp, e);
1911 } 1914 }
1912 } 1915 }
1916/*
1917 * done on caller ( not in attachments crossing for now)
1913 else 1918 else
1914 { 1919 {
1920
1915 if (!grp.IsDeleted) 1921 if (!grp.IsDeleted)
1916 { 1922 {
1917 PhysicsActor pa = grp.RootPart.PhysActor; 1923 PhysicsActor pa = grp.RootPart.PhysActor;
@@ -1920,15 +1926,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1920 pa.CrossingFailure(); 1926 pa.CrossingFailure();
1921 if (grp.RootPart.KeyframeMotion != null) 1927 if (grp.RootPart.KeyframeMotion != null)
1922 { 1928 {
1923 grp.RootPart.Velocity = Vector3.Zero; 1929 // moved to KeyframeMotion.CrossingFailure
1930// grp.RootPart.Velocity = Vector3.Zero;
1924 grp.RootPart.KeyframeMotion.CrossingFailure(); 1931 grp.RootPart.KeyframeMotion.CrossingFailure();
1925 grp.SendGroupRootTerseUpdate(); 1932// grp.SendGroupRootTerseUpdate();
1926 } 1933 }
1927 } 1934 }
1928 } 1935 }
1929 1936
1930 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp); 1937 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
1931 } 1938 }
1939 */
1932 } 1940 }
1933 else 1941 else
1934 { 1942 {
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index b7b0d27..42e3860 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -38,8 +38,8 @@ namespace OpenSim.Region.Framework.Scenes
38 [Flags] 38 [Flags]
39 public enum DataFormat : int 39 public enum DataFormat : int
40 { 40 {
41 Translation = 1, 41 Translation = 2,
42 Rotation = 2 42 Rotation = 1
43 } 43 }
44 44
45 [Serializable] 45 [Serializable]
@@ -53,17 +53,42 @@ namespace OpenSim.Region.Framework.Scenes
53 public Vector3 AngularVelocity; 53 public Vector3 AngularVelocity;
54 }; 54 };
55 55
56 private Vector3 m_serializedPosition;
56 private Vector3 m_basePosition; 57 private Vector3 m_basePosition;
57 private Quaternion m_baseRotation; 58 private Quaternion m_baseRotation;
58 private Vector3 m_serializedPosition;
59 59
60 private Keyframe m_currentFrame; 60 private Keyframe m_currentFrame;
61
61 private List<Keyframe> m_frames = new List<Keyframe>(); 62 private List<Keyframe> m_frames = new List<Keyframe>();
62 63
63 private Keyframe[] m_keyframes; 64 private Keyframe[] m_keyframes;
64 65
65 [NonSerialized()] 66 [NonSerialized()]
66 protected Timer m_timer = new Timer(); 67 protected Timer m_timer = null;
68
69 // timer lock
70 [NonSerialized()]
71 private object m_onTimerLock;
72
73 // timer overrun detect
74 // prevents overlap or timer events threads frozen on the lock
75 [NonSerialized()]
76 private bool m_inOnTimer;
77
78 // skip timer events.
79 //timer.stop doesn't assure there aren't event threads still being fired
80 [NonSerialized()]
81 private bool m_timerStopped;
82
83 [NonSerialized()]
84 private bool m_isCrossing;
85
86 [NonSerialized()]
87 private bool m_waitingCrossing;
88
89 // retry position for cross fail
90 [NonSerialized()]
91 private Vector3 m_nextPosition;
67 92
68 [NonSerialized()] 93 [NonSerialized()]
69 private SceneObjectGroup m_group; 94 private SceneObjectGroup m_group;
@@ -87,8 +112,8 @@ namespace OpenSim.Region.Framework.Scenes
87 public bool Selected 112 public bool Selected
88 { 113 {
89 set 114 set
90 { 115 {
91 if (value) 116 if (!value)
92 { 117 {
93 // Once we're let go, recompute positions 118 // Once we're let go, recompute positions
94 if (m_selected) 119 if (m_selected)
@@ -98,44 +123,104 @@ namespace OpenSim.Region.Framework.Scenes
98 { 123 {
99 // Save selection position in case we get moved 124 // Save selection position in case we get moved
100 if (!m_selected) 125 if (!m_selected)
126 {
127 StopTimer();
101 m_serializedPosition = m_group.AbsolutePosition; 128 m_serializedPosition = m_group.AbsolutePosition;
129 }
102 } 130 }
103 m_selected = value; } 131 m_isCrossing = false;
132 m_waitingCrossing = false;
133 m_selected = value;
134 }
135 }
136
137 private void StartTimer()
138 {
139 if (m_timer == null)
140 return;
141 m_timerStopped = false;
142 m_timer.Start();
104 } 143 }
105 144
145 private void StopTimer()
146 {
147 if (m_timer == null || m_timerStopped)
148 return;
149 m_timerStopped = true;
150 m_timer.Stop();
151 }
152
153 private void RemoveTimer()
154 {
155 if (m_timer == null)
156 return;
157 m_timerStopped = true;
158 m_timer.Stop();
159 m_timer.Elapsed -= OnTimer;
160 m_timer = null;
161 }
162
163
106 public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data) 164 public static KeyframeMotion FromData(SceneObjectGroup grp, Byte[] data)
107 { 165 {
108 MemoryStream ms = new MemoryStream(data); 166 KeyframeMotion newMotion = null;
109 167
110 BinaryFormatter fmt = new BinaryFormatter(); 168 try
169 {
170 MemoryStream ms = new MemoryStream(data);
171 BinaryFormatter fmt = new BinaryFormatter();
172
173 newMotion = (KeyframeMotion)fmt.Deserialize(ms);
111 174
112 KeyframeMotion newMotion = (KeyframeMotion)fmt.Deserialize(ms); 175 newMotion.m_group = grp;
113 176
114 // This will be started when position is updated 177 if (grp != null && grp.IsSelected)
115 newMotion.m_timer = new Timer(); 178 newMotion.m_selected = true;
116 newMotion.m_timer.Interval = (int)timerInterval; 179
117 newMotion.m_timer.AutoReset = true; 180 newMotion.m_onTimerLock = new object();
118 newMotion.m_timer.Elapsed += newMotion.OnTimer; 181 newMotion.m_timerStopped = false;
182 newMotion.m_inOnTimer = false;
183 newMotion.m_isCrossing = false;
184 newMotion.m_waitingCrossing = false;
185 }
186 catch
187 {
188 newMotion = null;
189 }
119 190
120 return newMotion; 191 return newMotion;
121 } 192 }
122 193
123 public void UpdateSceneObject(SceneObjectGroup grp) 194 public void UpdateSceneObject(SceneObjectGroup grp)
124 { 195 {
125 m_group = grp; 196// lock (m_onTimerLock)
126 Vector3 offset = grp.AbsolutePosition - m_serializedPosition;
127
128 m_basePosition += offset;
129 m_currentFrame.Position += offset;
130 for (int i = 0 ; i < m_frames.Count ; i++)
131 { 197 {
132 Keyframe k = m_frames[i]; 198 m_isCrossing = false;
133 k.Position += offset; 199 m_waitingCrossing = false;
134 m_frames[i] = k; 200 StopTimer();
135 } 201
202 m_group = grp;
203 Vector3 grppos = grp.AbsolutePosition;
204 Vector3 offset = grppos - m_serializedPosition;
205 // avoid doing it more than once
206 // current this will happen draging a prim to other region
207 m_serializedPosition = grppos;
208
209 m_basePosition += offset;
210 m_currentFrame.Position += offset;
136 211
137 if (m_running) 212 m_nextPosition += offset;
138 Start(); 213
214 for (int i = 0; i < m_frames.Count; i++)
215 {
216 Keyframe k = m_frames[i];
217 k.Position += offset;
218 m_frames[i]=k;
219 }
220
221 if (m_running)
222 Start();
223 }
139 } 224 }
140 225
141 public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data) 226 public KeyframeMotion(SceneObjectGroup grp, PlayMode mode, DataFormat data)
@@ -143,13 +228,16 @@ namespace OpenSim.Region.Framework.Scenes
143 m_mode = mode; 228 m_mode = mode;
144 m_data = data; 229 m_data = data;
145 230
146 m_group = grp; 231 m_onTimerLock = new object();
147 m_basePosition = grp.AbsolutePosition;
148 m_baseRotation = grp.GroupRotation;
149 232
150 m_timer.Interval = (int)timerInterval; 233 m_group = grp;
151 m_timer.AutoReset = true; 234 if (grp != null)
152 m_timer.Elapsed += OnTimer; 235 {
236 m_basePosition = grp.AbsolutePosition;
237 m_baseRotation = grp.GroupRotation;
238 }
239 m_isCrossing = false;
240 m_waitingCrossing = false;
153 } 241 }
154 242
155 public void SetKeyframes(Keyframe[] frames) 243 public void SetKeyframes(Keyframe[] frames)
@@ -157,19 +245,93 @@ namespace OpenSim.Region.Framework.Scenes
157 m_keyframes = frames; 245 m_keyframes = frames;
158 } 246 }
159 247
248 public KeyframeMotion Copy(SceneObjectGroup newgrp)
249 {
250 StopTimer();
251
252 KeyframeMotion newmotion = new KeyframeMotion(newgrp, m_mode, m_data);
253
254 if (newgrp != null && newgrp.IsSelected)
255 newmotion.m_selected = true;
256
257 if (m_keyframes != null)
258 m_keyframes.CopyTo(newmotion.m_keyframes, 0);
259
260 newmotion.m_frames = new List<Keyframe>(m_frames);
261 newmotion.m_currentFrame = m_currentFrame;
262
263 newmotion.m_nextPosition = m_nextPosition;
264 if (m_selected)
265 newmotion.m_serializedPosition = m_serializedPosition;
266 else
267 {
268 if (m_group != null)
269 newmotion.m_serializedPosition = m_group.AbsolutePosition;
270 else
271 newmotion.m_serializedPosition = m_serializedPosition;
272 }
273
274 newmotion.m_iterations = m_iterations;
275
276 newmotion.m_onTimerLock = new object();
277 newmotion.m_timerStopped = false;
278 newmotion.m_inOnTimer = false;
279 newmotion.m_isCrossing = false;
280 newmotion.m_waitingCrossing = false;
281
282 if (m_running && !m_waitingCrossing)
283 StartTimer();
284
285 return newmotion;
286 }
287
288 public void Delete()
289 {
290 m_running = false;
291 RemoveTimer();
292 m_isCrossing = false;
293 m_waitingCrossing = false;
294 m_frames.Clear();
295 m_keyframes = null;
296 }
297
160 public void Start() 298 public void Start()
161 { 299 {
300 m_isCrossing = false;
301 m_waitingCrossing = false;
162 if (m_keyframes.Length > 0) 302 if (m_keyframes.Length > 0)
163 m_timer.Start(); 303 {
164 m_running = true; 304 if (m_timer == null)
305 {
306 m_timer = new Timer();
307 m_timer.Interval = timerInterval;
308 m_timer.AutoReset = true;
309 m_timer.Elapsed += OnTimer;
310 }
311 else
312 {
313 StopTimer();
314 m_timer.Interval = timerInterval;
315 }
316
317 m_inOnTimer = false;
318 StartTimer();
319 m_running = true;
320 }
321 else
322 {
323 m_running = false;
324 RemoveTimer();
325 }
165 } 326 }
166 327
167 public void Stop() 328 public void Stop()
168 { 329 {
169 // Failed object creation 330 m_running = false;
170 if (m_timer == null) 331 m_isCrossing = false;
171 return; 332 m_waitingCrossing = false;
172 m_timer.Stop(); 333
334 RemoveTimer();
173 335
174 m_basePosition = m_group.AbsolutePosition; 336 m_basePosition = m_group.AbsolutePosition;
175 m_baseRotation = m_group.GroupRotation; 337 m_baseRotation = m_group.GroupRotation;
@@ -179,17 +341,16 @@ namespace OpenSim.Region.Framework.Scenes
179 m_group.SendGroupRootTerseUpdate(); 341 m_group.SendGroupRootTerseUpdate();
180 342
181 m_frames.Clear(); 343 m_frames.Clear();
182 m_running = false;
183 } 344 }
184 345
185 public void Pause() 346 public void Pause()
186 { 347 {
348 m_running = false;
349 RemoveTimer();
350
187 m_group.RootPart.Velocity = Vector3.Zero; 351 m_group.RootPart.Velocity = Vector3.Zero;
188 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero); 352 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
189 m_group.SendGroupRootTerseUpdate(); 353 m_group.SendGroupRootTerseUpdate();
190
191 m_timer.Stop();
192 m_running = false;
193 } 354 }
194 355
195 private void GetNextList() 356 private void GetNextList()
@@ -222,9 +383,16 @@ namespace OpenSim.Region.Framework.Scenes
222 Keyframe k = m_keyframes[i]; 383 Keyframe k = m_keyframes[i];
223 384
224 if (k.Position.HasValue) 385 if (k.Position.HasValue)
225 k.Position = (k.Position * direction) + pos; 386 {
387 k.Position = (k.Position * direction);
388// k.Velocity = (Vector3)k.Position / (k.TimeMS / 1000.0f);
389 k.Position += pos;
390 }
226 else 391 else
392 {
227 k.Position = pos; 393 k.Position = pos;
394// k.Velocity = Vector3.Zero;
395 }
228 396
229 k.StartRotation = rot; 397 k.StartRotation = rot;
230 if (k.Rotation.HasValue) 398 if (k.Rotation.HasValue)
@@ -238,6 +406,8 @@ namespace OpenSim.Region.Framework.Scenes
238 k.Rotation = rot; 406 k.Rotation = rot;
239 } 407 }
240 408
409/* ang vel not in use for now
410
241 float angle = 0; 411 float angle = 0;
242 412
243 float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W; 413 float aa = k.StartRotation.X * k.StartRotation.X + k.StartRotation.Y * k.StartRotation.Y + k.StartRotation.Z * k.StartRotation.Z + k.StartRotation.W * k.StartRotation.W;
@@ -267,6 +437,7 @@ namespace OpenSim.Region.Framework.Scenes
267 } 437 }
268 438
269 k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000)); 439 k.AngularVelocity = (new Vector3(0, 0, 1) * (Quaternion)k.Rotation) * (angle / (k.TimeMS / 1000));
440 */
270 k.TimeTotal = k.TimeMS; 441 k.TimeTotal = k.TimeMS;
271 442
272 m_frames.Add(k); 443 m_frames.Add(k);
@@ -284,139 +455,232 @@ namespace OpenSim.Region.Framework.Scenes
284 455
285 protected void OnTimer(object sender, ElapsedEventArgs e) 456 protected void OnTimer(object sender, ElapsedEventArgs e)
286 { 457 {
287 if (m_frames.Count == 0) 458 if (m_timerStopped) // trap events still in air even after a timer.stop
288 { 459 return;
289 GetNextList();
290
291 if (m_frames.Count == 0)
292 {
293 Stop();
294 return;
295 }
296
297 m_currentFrame = m_frames[0];
298 }
299 460
300 if (m_selected) 461 if (m_inOnTimer) // don't let overruns to happen
301 { 462 {
302 if (m_group.RootPart.Velocity != Vector3.Zero) 463 m_log.Warn("[KeyFrame]: timer overrun");
303 {
304 m_group.RootPart.Velocity = Vector3.Zero;
305 m_group.SendGroupRootTerseUpdate();
306 }
307 return; 464 return;
308 } 465 }
309 466
310 // Do the frame processing 467 if (m_group == null)
311 double steps = (double)m_currentFrame.TimeMS / timerInterval; 468 return;
312 float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
313 469
314 if (steps <= 1.0) 470 lock (m_onTimerLock)
315 { 471 {
316 m_currentFrame.TimeMS = 0;
317 472
318 m_group.AbsolutePosition = (Vector3)m_currentFrame.Position; 473 m_inOnTimer = true;
319 m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
320 }
321 else
322 {
323 Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
324 Vector3 motionThisFrame = v / (float)steps;
325 v = v * 1000 / m_currentFrame.TimeMS;
326 474
327 bool update = false; 475 bool update = false;
328 476
329 if (Vector3.Mag(motionThisFrame) >= 0.05f) 477 try
330 { 478 {
331 m_group.AbsolutePosition += motionThisFrame; 479 if (m_selected)
332 m_group.RootPart.Velocity = v; 480 {
333 update = true; 481 if (m_group.RootPart.Velocity != Vector3.Zero)
334 } 482 {
483 m_group.RootPart.Velocity = Vector3.Zero;
484 m_group.SendGroupRootTerseUpdate();
485 }
486 m_inOnTimer = false;
487 return;
488 }
335 489
336 if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation) 490 if (m_isCrossing)
337 { 491 {
338 Quaternion current = m_group.GroupRotation; 492 // if crossing and timer running then cross failed
493 // wait some time then
494 // retry to set the position that evtually caused the outbound
495 // if still outside region this will call startCrossing below
496 m_isCrossing = false;
497 m_group.AbsolutePosition = m_nextPosition;
498 if (!m_isCrossing)
499 {
500 StopTimer();
501 m_timer.Interval = timerInterval;
502 StartTimer();
503 }
504 m_inOnTimer = false;
505 return;
506 }
339 507
340 Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete); 508 if (m_frames.Count == 0)
509 {
510 GetNextList();
341 511
342 float angle = 0; 512 if (m_frames.Count == 0)
513 {
514 Stop();
515 m_inOnTimer = false;
516 return;
517 }
343 518
344 float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W; 519 m_currentFrame = m_frames[0];
345 float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W; 520 m_currentFrame.TimeMS += (int)timerInterval;
346 float aa_bb = aa * bb;
347 521
348 if (aa_bb == 0) 522 //force a update on a keyframe transition
523 update = true;
524 }
525
526 m_currentFrame.TimeMS -= (int)timerInterval;
527
528 // Do the frame processing
529 double steps = (double)m_currentFrame.TimeMS / timerInterval;
530
531 if (steps <= 0.0)
349 { 532 {
350 angle = 0; 533 m_group.RootPart.Velocity = Vector3.Zero;
534 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero);
535
536 m_nextPosition = (Vector3)m_currentFrame.Position;
537 m_group.AbsolutePosition = m_nextPosition;
538
539 m_group.UpdateGroupRotationR((Quaternion)m_currentFrame.Rotation);
540
541 m_frames.RemoveAt(0);
542 if (m_frames.Count > 0)
543 m_currentFrame = m_frames[0];
544
545 update = true;
351 } 546 }
352 else 547 else
353 { 548 {
354 float ab = current.X * step.X + 549 float complete = ((float)m_currentFrame.TimeTotal - (float)m_currentFrame.TimeMS) / (float)m_currentFrame.TimeTotal;
355 current.Y * step.Y +
356 current.Z * step.Z +
357 current.W * step.W;
358 float q = (ab * ab) / aa_bb;
359 550
360 if (q > 1.0f) 551 Vector3 v = (Vector3)m_currentFrame.Position - m_group.AbsolutePosition;
552 Vector3 motionThisFrame = v / (float)steps;
553 v = v * 1000 / m_currentFrame.TimeMS;
554
555 if (Vector3.Mag(motionThisFrame) >= 0.05f)
361 { 556 {
362 angle = 0; 557 // m_group.AbsolutePosition += motionThisFrame;
558 m_nextPosition = m_group.AbsolutePosition + motionThisFrame;
559 m_group.AbsolutePosition = m_nextPosition;
560
561 m_group.RootPart.Velocity = v;
562 update = true;
363 } 563 }
364 else 564
565 if ((Quaternion)m_currentFrame.Rotation != m_group.GroupRotation)
365 { 566 {
366 angle = (float)Math.Acos(2 * q - 1); 567 Quaternion current = m_group.GroupRotation;
568
569 Quaternion step = Quaternion.Slerp(m_currentFrame.StartRotation, (Quaternion)m_currentFrame.Rotation, complete);
570/* use simpler change detection
571 * float angle = 0;
572
573 float aa = current.X * current.X + current.Y * current.Y + current.Z * current.Z + current.W * current.W;
574 float bb = step.X * step.X + step.Y * step.Y + step.Z * step.Z + step.W * step.W;
575 float aa_bb = aa * bb;
576
577 if (aa_bb == 0)
578 {
579 angle = 0;
580 }
581 else
582 {
583 float ab = current.X * step.X +
584 current.Y * step.Y +
585 current.Z * step.Z +
586 current.W * step.W;
587 float q = (ab * ab) / aa_bb;
588
589 if (q > 1.0f)
590 {
591 angle = 0;
592 }
593 else
594 {
595 angle = (float)Math.Acos(2 * q - 1);
596 }
597 }
598
599 if (angle > 0.01f)
600 */
601 if(Math.Abs(step.X - current.X) > 0.001f
602 || Math.Abs(step.Y - current.Y) > 0.001f
603 || Math.Abs(step.Z - current.Z) > 0.001f)
604 // assuming w is a dependente var
605
606 {
607 m_group.UpdateGroupRotationR(step);
608 //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
609 update = true;
610 }
367 } 611 }
368 } 612 }
369 613
370 if (angle > 0.01f) 614 if (update)
371 { 615 m_group.SendGroupRootTerseUpdate();
372 m_group.UpdateGroupRotationR(step);
373 //m_group.RootPart.UpdateAngularVelocity(m_currentFrame.AngularVelocity / 2);
374 update = true;
375 }
376 }
377
378 if (update)
379 m_group.SendGroupRootTerseUpdate();
380 }
381
382 m_currentFrame.TimeMS -= (int)timerInterval;
383 616
384 if (m_currentFrame.TimeMS <= 0) 617 }
385 { 618 catch ( Exception ex)
386 m_group.RootPart.Velocity = Vector3.Zero; 619 {
387 m_group.RootPart.UpdateAngularVelocity(Vector3.Zero); 620 // still happening sometimes
388 m_group.SendGroupRootTerseUpdate(); 621 // lets try to see where
622 m_log.Warn("[KeyFrame]: timer overrun" + ex.Message);
623 }
389 624
390 m_frames.RemoveAt(0); 625 finally
391 if (m_frames.Count > 0) 626 {
392 m_currentFrame = m_frames[0]; 627 // make sure we do not let this frozen
628 m_inOnTimer = false;
629 }
393 } 630 }
394 } 631 }
395 632
396 public Byte[] Serialize() 633 public Byte[] Serialize()
397 { 634 {
635 StopTimer();
398 MemoryStream ms = new MemoryStream(); 636 MemoryStream ms = new MemoryStream();
399 m_timer.Stop();
400 637
401 BinaryFormatter fmt = new BinaryFormatter(); 638 BinaryFormatter fmt = new BinaryFormatter();
402 SceneObjectGroup tmp = m_group; 639 SceneObjectGroup tmp = m_group;
403 m_group = null; 640 m_group = null;
404 m_serializedPosition = tmp.AbsolutePosition; 641 if (!m_selected && tmp != null)
642 m_serializedPosition = tmp.AbsolutePosition;
405 fmt.Serialize(ms, this); 643 fmt.Serialize(ms, this);
406 m_group = tmp; 644 m_group = tmp;
645 if (m_running && !m_waitingCrossing)
646 StartTimer();
647
407 return ms.ToArray(); 648 return ms.ToArray();
408 } 649 }
409 650
651 public void StartCrossingCheck()
652 {
653 // timer will be restart by crossingFailure
654 // or never since crossing worked and this
655 // should be deleted
656 StopTimer();
657
658 m_isCrossing = true;
659 m_waitingCrossing = true;
660
661// to remove / retune to smoth crossings
662 if (m_group.RootPart.Velocity != Vector3.Zero)
663 {
664 m_group.RootPart.Velocity = Vector3.Zero;
665 m_group.SendGroupRootTerseUpdate();
666 }
667 }
668
410 public void CrossingFailure() 669 public void CrossingFailure()
411 { 670 {
412 // The serialization has stopped the timer, so let's wait a moment 671 m_waitingCrossing = false;
413 // then retry the crossing. We'll get back here if it fails. 672
414 Util.FireAndForget(delegate (object x) 673 if (m_group != null)
415 { 674 {
416 Thread.Sleep(60000); 675 m_group.RootPart.Velocity = Vector3.Zero;
417 if (m_running) 676 m_group.SendGroupRootTerseUpdate();
418 m_timer.Start(); 677
419 }); 678 if (m_running && m_timer != null)
679 {
680 m_timer.Interval = 60000;
681 StartTimer();
682 }
683 }
420 } 684 }
421 } 685 }
422} 686}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 57fcf51..0237021 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2346,6 +2346,12 @@ namespace OpenSim.Region.Framework.Scenes
2346 2346
2347 foreach (SceneObjectPart part in partList) 2347 foreach (SceneObjectPart part in partList)
2348 { 2348 {
2349 if (part.KeyframeMotion != null)
2350 {
2351 part.KeyframeMotion.Delete();
2352 part.KeyframeMotion = null;
2353 }
2354
2349 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0)) 2355 if (part.IsJoint() && ((part.Flags & PrimFlags.Physics) != 0))
2350 { 2356 {
2351 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed? 2357 PhysicsScene.RequestJointDeletion(part.Name); // FIXME: what if the name changed?
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index eee53d7..5052683 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -509,6 +509,9 @@ namespace OpenSim.Region.Framework.Scenes
509 Vector3 newpos = Vector3.Zero; 509 Vector3 newpos = Vector3.Zero;
510 OpenSim.Services.Interfaces.GridRegion destination = null; 510 OpenSim.Services.Interfaces.GridRegion destination = null;
511 511
512 if (m_rootPart.KeyframeMotion != null)
513 m_rootPart.KeyframeMotion.StartCrossingCheck();
514
512 bool canCross = true; 515 bool canCross = true;
513 foreach (ScenePresence av in m_linkedAvatars) 516 foreach (ScenePresence av in m_linkedAvatars)
514 { 517 {
@@ -551,7 +554,7 @@ namespace OpenSim.Region.Framework.Scenes
551 av.ParentID = 0; 554 av.ParentID = 0;
552 } 555 }
553 556
554// m_linkedAvatars.Clear(); 557 // m_linkedAvatars.Clear();
555 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 558 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
556 559
557 // Normalize 560 // Normalize
@@ -599,11 +602,16 @@ namespace OpenSim.Region.Framework.Scenes
599 avsToCross.Clear(); 602 avsToCross.Clear();
600 603
601 } 604 }
602 else if (RootPart.PhysActor != null) 605 else
603 { 606 {
604 RootPart.PhysActor.CrossingFailure(); 607 if (m_rootPart.KeyframeMotion != null)
605 } 608 m_rootPart.KeyframeMotion.CrossingFailure();
606 609
610 if (RootPart.PhysActor != null)
611 {
612 RootPart.PhysActor.CrossingFailure();
613 }
614 }
607 Vector3 oldp = AbsolutePosition; 615 Vector3 oldp = AbsolutePosition;
608 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f); 616 val.X = Util.Clamp<float>(oldp.X, 0.5f, (float)Constants.RegionSize - 0.5f);
609 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f); 617 val.Y = Util.Clamp<float>(oldp.Y, 0.5f, (float)Constants.RegionSize - 0.5f);
@@ -2059,7 +2067,7 @@ namespace OpenSim.Region.Framework.Scenes
2059 if (part.KeyframeMotion != null) 2067 if (part.KeyframeMotion != null)
2060 { 2068 {
2061 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize()); 2069 part.KeyframeMotion = KeyframeMotion.FromData(backup_group, part.KeyframeMotion.Serialize());
2062 part.KeyframeMotion.UpdateSceneObject(this); 2070// part.KeyframeMotion.UpdateSceneObject(this);
2063 } 2071 }
2064 }); 2072 });
2065 2073
@@ -3025,7 +3033,8 @@ namespace OpenSim.Region.Framework.Scenes
3025 /// <param name="objectGroup"></param> 3033 /// <param name="objectGroup"></param>
3026 public virtual void DetachFromBackup() 3034 public virtual void DetachFromBackup()
3027 { 3035 {
3028 m_scene.SceneGraph.FireDetachFromBackup(this); 3036 if (m_scene != null)
3037 m_scene.SceneGraph.FireDetachFromBackup(this);
3029 if (m_isBackedUp && Scene != null) 3038 if (m_isBackedUp && Scene != null)
3030 m_scene.EventManager.OnBackup -= ProcessBackup; 3039 m_scene.EventManager.OnBackup -= ProcessBackup;
3031 3040
@@ -4407,6 +4416,15 @@ namespace OpenSim.Region.Framework.Scenes
4407 public virtual ISceneObject CloneForNewScene() 4416 public virtual ISceneObject CloneForNewScene()
4408 { 4417 {
4409 SceneObjectGroup sog = Copy(false); 4418 SceneObjectGroup sog = Copy(false);
4419 sog.ForEachPart(delegate(SceneObjectPart part)
4420 {
4421 if (part.KeyframeMotion != null)
4422 {
4423 part.KeyframeMotion = KeyframeMotion.FromData(sog, part.KeyframeMotion.Serialize());
4424 // this is called later
4425// part.KeyframeMotion.UpdateSceneObject(this);
4426 }
4427 });
4410 sog.IsDeleted = false; 4428 sog.IsDeleted = false;
4411 return sog; 4429 return sog;
4412 } 4430 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ed626d0..bf5fc99 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -769,7 +769,7 @@ namespace OpenSim.Region.Framework.Scenes
769 { 769 {
770 m_groupPosition = value; 770 m_groupPosition = value;
771 PhysicsActor actor = PhysActor; 771 PhysicsActor actor = PhysActor;
772 if (actor != null) 772 if (actor != null && ParentGroup.Scene.PhysicsScene != null)
773 { 773 {
774 try 774 try
775 { 775 {
@@ -3408,6 +3408,9 @@ namespace OpenSim.Region.Framework.Scenes
3408 /// </summary> 3408 /// </summary>
3409 public void SendTerseUpdateToAllClients() 3409 public void SendTerseUpdateToAllClients()
3410 { 3410 {
3411 if (ParentGroup == null || ParentGroup.Scene == null)
3412 return;
3413
3411 ParentGroup.Scene.ForEachClient(delegate(IClientAPI client) 3414 ParentGroup.Scene.ForEachClient(delegate(IClientAPI client)
3412 { 3415 {
3413 SendTerseUpdateToClient(client); 3416 SendTerseUpdateToClient(client);
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 134bd9d..123c158 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1241,7 +1241,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1241 1241
1242 if (sog.RootPart.KeyframeMotion != null) 1242 if (sog.RootPart.KeyframeMotion != null)
1243 { 1243 {
1244 Byte[] data = sog.RootPart.KeyframeMotion.Serialize(); 1244 Byte[] data = sog.RootPart.KeyframeMotion.Serialize();
1245 1245
1246 writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty); 1246 writer.WriteStartElement(String.Empty, "KeyframeMotion", String.Empty);
1247 writer.WriteBase64(data, 0, data.Length); 1247 writer.WriteBase64(data, 0, data.Length);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5830eff..7dae53a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12964,7 +12964,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
12964 if (frames.Data.Length > 0) // We are getting a new motion 12964 if (frames.Data.Length > 0) // We are getting a new motion
12965 { 12965 {
12966 if (group.RootPart.KeyframeMotion != null) 12966 if (group.RootPart.KeyframeMotion != null)
12967 group.RootPart.KeyframeMotion.Stop(); 12967 group.RootPart.KeyframeMotion.Delete();
12968 group.RootPart.KeyframeMotion = null; 12968 group.RootPart.KeyframeMotion = null;
12969 12969
12970 int idx = 0; 12970 int idx = 0;