diff options
| author | McCabe Maxsted | 2010-05-28 18:34:36 -0700 |
|---|---|---|
| committer | Jacek Antonelli | 2010-06-19 02:43:26 -0500 |
| commit | e03a057fc899a0b362f9f2bb37fd012acec45e96 (patch) | |
| tree | 0028a8041825fbd34c791237b54a52d7d1c930ff /linden/indra | |
| parent | fix: crash when sim crashes/disconnects (diff) | |
| download | meta-impy-e03a057fc899a0b362f9f2bb37fd012acec45e96.zip meta-impy-e03a057fc899a0b362f9f2bb37fd012acec45e96.tar.gz meta-impy-e03a057fc899a0b362f9f2bb37fd012acec45e96.tar.bz2 meta-impy-e03a057fc899a0b362f9f2bb37fd012acec45e96.tar.xz | |
Fixed issue with certain sit animations not loading
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/llcharacter/llkeyframemotion.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/llcharacter/llkeyframemotion.cpp b/linden/indra/llcharacter/llkeyframemotion.cpp index c1e26a1..3b4cf7e 100644 --- a/linden/indra/llcharacter/llkeyframemotion.cpp +++ b/linden/indra/llcharacter/llkeyframemotion.cpp | |||
| @@ -1364,8 +1364,10 @@ BOOL LLKeyframeMotion::deserialize(LLDataPacker& dp) | |||
| 1364 | } | 1364 | } |
| 1365 | else | 1365 | else |
| 1366 | { | 1366 | { |
| 1367 | llwarns << "joint not found: " << llendl; | 1367 | llwarns << "joint not found: " << joint_name << llendl; |
| 1368 | return FALSE; | 1368 | // Returning here causes certain sits to fail on OpenSim, and this line is commented out of V2. |
| 1369 | // Seems safe enough to comment out here -- MC | ||
| 1370 | //return FALSE; | ||
| 1369 | } | 1371 | } |
| 1370 | 1372 | ||
| 1371 | joint_motion->mJointName = joint_name; | 1373 | joint_motion->mJointName = joint_name; |