diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
| commit | d0811218381cfa9d201d7b72532e19d98bda250a (patch) | |
| tree | 65d3c325feeac71171813d3302bd1c4517b22cb2 /indra/llcharacter/llkeyframemotion.h | |
| parent | cc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.h')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h index f1fa56d731..15c5c7c6c0 100644 --- a/indra/llcharacter/llkeyframemotion.h +++ b/indra/llcharacter/llkeyframemotion.h @@ -151,7 +151,7 @@ public: public: U32 getFileSize(); BOOL serialize(LLDataPacker& dp) const; - BOOL deserialize(LLDataPacker& dp); + BOOL deserialize(LLDataPacker& dp, const LLUUID& asset_id); BOOL isLoaded() { return mJointMotionList != NULL; } void dumpToFile(const std::string& name); |