summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.h
diff options
context:
space:
mode:
authorprep linden <prep@lindenlab.com>2010-11-22 13:16:39 -0500
committerprep linden <prep@lindenlab.com>2010-11-22 13:16:39 -0500
commit43382f2849d5b2e8a5826a7a7d4f41254ab41735 (patch)
tree1c66f3954e9a26ad27a675d8fa25e05cd3db36ce /indra/newview/llfloatermodelpreview.h
parent2915715ec4a9bb7978c4a0db0afc26b73ab8b2fb (diff)
merge of earlier code that got stomped from a previous merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r--indra/newview/llfloatermodelpreview.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 7e9978f330..05106644dc 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -97,6 +97,7 @@ public:
LLColor4 getDaeColor(daeElement* element);
daeElement* getChildFromElement( daeElement* pElement, std::string const & name );
+
bool isNodeAJoint( domNode* pNode );
void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );