diff options
| author | McCabe Maxsted | 2010-04-30 01:17:35 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-05-04 02:15:11 -0500 |
| commit | 5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a (patch) | |
| tree | 41afbefff0f5bf845dd1e33850a663ca69a7ad1c /linden | |
| parent | Applied patch for SNOW-384 by Ardy Lay: A tool_tip is obscuring our view when... (diff) | |
| download | meta-impy-5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a.zip meta-impy-5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a.tar.gz meta-impy-5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a.tar.bz2 meta-impy-5d05f7006ef4b6a1a13d4b45b3ae1ffa0dafb76a.tar.xz | |
Applied patch for SNOW-484 by Robin Cornelius: recursive animations can crash viewer
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/llcharacter/llkeyframemotion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp index 4cb2227..c1e26a1 100644 --- a/linden/indra/llcharacter/llkeyframemotion.cpp +++ b/linden/indra/llcharacter/llkeyframemotion.cpp | |||
| @@ -1246,6 +1246,12 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) | |||
| 1246 | return FALSE; | 1246 | return FALSE; |
| 1247 | } | 1247 | } |
| 1248 | 1248 | ||
| 1249 | if(mJointMotionList->mEmoteName==mID.asString()) | ||
| 1250 | { | ||
| 1251 | llwarns << "Malformed animation mEmoteName==mID" << llendl; | ||
| 1252 | return FALSE; | ||
| 1253 | } | ||
| 1254 | |||
| 1249 | //------------------------------------------------------------------------- | 1255 | //------------------------------------------------------------------------- |
| 1250 | // get loop | 1256 | // get loop |
| 1251 | //------------------------------------------------------------------------- | 1257 | //------------------------------------------------------------------------- |