diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:07:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-06-20 17:07:27 -0400 |
| commit | 8ee8778347a32d4170f2e0be3044e1814e4b5ea8 (patch) | |
| tree | ab494a94d4bcec150fb096a0dd01389711acd8da /indra/llcharacter/llkeyframemotion.h | |
| parent | d8be66c8e2dc979f7497841cd79fa6bd4172b4c8 (diff) | |
| parent | e647ea2ef4620d137d75552bfa47f5e7ee93bf60 (diff) | |
merge changes for MAINT-7466
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); |