diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 20:55:02 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-15 21:36:58 +0200 |
| commit | 2800905ac354fec6316cf83da85eb5f4c6060741 (patch) | |
| tree | 56ca4cb7d8de5ce698a164bb869812c16164c21a /indra/llcharacter/llkeyframemotion.h | |
| parent | 6583fdf526c356b47122de3894b0fb68d83ae50b (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge branch master (DRTVWR-552) into DRTVWR-542-meshopt
+resolved viewer-manager's inherited conflict
Diffstat (limited to 'indra/llcharacter/llkeyframemotion.h')
| -rw-r--r-- | indra/llcharacter/llkeyframemotion.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h index 15c5c7c6c0..d640556090 100644 --- a/indra/llcharacter/llkeyframemotion.h +++ b/indra/llcharacter/llkeyframemotion.h @@ -44,7 +44,6 @@ #include "llbvhconsts.h" class LLKeyframeDataCache; -class LLVFS; class LLDataPacker; #define MIN_REQUIRED_PIXEL_AREA_KEYFRAME (40.f) @@ -141,10 +140,7 @@ public: virtual void setStopTime(F32 time); - static void setVFS(LLVFS* vfs) { sVFS = vfs; } - - static void onLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, + static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); @@ -416,13 +412,7 @@ public: U32 getNumJointMotions() const { return mJointMotionArray.size(); } }; - protected: - static LLVFS* sVFS; - - //------------------------------------------------------------------------- - // Member Data - //------------------------------------------------------------------------- JointMotionList* mJointMotionList; std::vector<LLPointer<LLJointState> > mJointStates; LLJoint* mPelvisp; |