summaryrefslogtreecommitdiff
path: root/indra/llappearance/llavatarappearance.h
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2020-11-30 20:19:54 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2020-11-30 20:19:54 +0200
commit792c086e91c4f66d2cde6a9db7fcc17f9918c3c0 (patch)
tree9030738cd2ee73a745f4adda5251bfae5a04abe8 /indra/llappearance/llavatarappearance.h
parent0bd916d9ede3bb3e85ed5a9278498c5e1bb462f5 (diff)
SL-14369 Get rid of static sSkeletonXMLTree
Diffstat (limited to 'indra/llappearance/llavatarappearance.h')
-rw-r--r--indra/llappearance/llavatarappearance.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index 4f497c0887..b1c70f9064 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -156,7 +156,7 @@ public:
protected:
- static BOOL parseSkeletonFile(const std::string& filename);
+ static BOOL parseSkeletonFile(const std::string& filename, LLXmlTree& skeleton_xml_tree);
virtual void buildCharacter();
virtual BOOL loadAvatar();
@@ -211,8 +211,6 @@ public:
// XML parse tree
//--------------------------------------------------------------------
protected:
- static LLXmlTree sSkeletonXMLTree; // avatar skeleton file
-
static LLAvatarSkeletonInfo* sAvatarSkeletonInfo;
static LLAvatarXmlInfo* sAvatarXmlInfo;