diff options
author | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-12-05 17:40:04 -0500 |
commit | 295a4c63b4912f05a729178e8e34ba26e92ff37b (patch) | |
tree | 19fc1232fc6f8040ce5598fdd9649646116f7ea9 /indra/newview/llfloaterbvhpreview.h | |
parent | 2d8ad89f33e9fa65dea11fd4c78962fc568ee00a (diff) | |
parent | 05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (diff) |
merge changes for 5.0.0-release
Diffstat (limited to 'indra/newview/llfloaterbvhpreview.h')
-rw-r--r-- | indra/newview/llfloaterbvhpreview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbvhpreview.h b/indra/newview/llfloaterbvhpreview.h index b81cc6e3a5..20d15d9603 100644 --- a/indra/newview/llfloaterbvhpreview.h +++ b/indra/newview/llfloaterbvhpreview.h @@ -109,7 +109,9 @@ public: S32 status, LLExtStat ext_status); private: void setAnimCallbacks() ; - + std::map <std::string, std::string> getJointAliases(); + + protected: void draw(); void resetMotion(); |