diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2020-11-30 15:57:44 +0200 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2020-11-30 15:57:44 +0200 |
| commit | 0bd916d9ede3bb3e85ed5a9278498c5e1bb462f5 (patch) | |
| tree | 986dfd875a1c13ce18344a28aaf92d38b7711fc7 | |
| parent | 300f6f8b8e74fb5538beeb39b88ee9bccf9e8129 (diff) | |
SL-14369 FIXED BugSplat Crash LLAppViewer::cleanup()
| -rw-r--r-- | indra/llappearance/llavatarappearance.cpp | 7 | ||||
| -rw-r--r-- | indra/llappearance/llavatarappearance.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp index 4d36759167..4894f1fe4e 100644 --- a/indra/llappearance/llavatarappearance.cpp +++ b/indra/llappearance/llavatarappearance.cpp @@ -171,7 +171,6 @@ LLAvatarAppearance::LLAvatarXmlInfo::~LLAvatarXmlInfo() //----------------------------------------------------------------------------- // Static Data //----------------------------------------------------------------------------- -LLXmlTree LLAvatarAppearance::sXMLTree; LLXmlTree LLAvatarAppearance::sSkeletonXMLTree; LLAvatarSkeletonInfo* LLAvatarAppearance::sAvatarSkeletonInfo = NULL; LLAvatarAppearance::LLAvatarXmlInfo* LLAvatarAppearance::sAvatarXmlInfo = NULL; @@ -353,14 +352,15 @@ void LLAvatarAppearance::initClass(const std::string& avatar_file_name_arg, cons { avatar_file_name = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,AVATAR_DEFAULT_CHAR + "_lad.xml"); } - BOOL success = sXMLTree.parseFile( avatar_file_name, FALSE ); + LLXmlTree xml_tree; + BOOL success = xml_tree.parseFile( avatar_file_name, FALSE ); if (!success) { LL_ERRS() << "Problem reading avatar configuration file:" << avatar_file_name << LL_ENDL; } // now sanity check xml file - LLXmlTreeNode* root = sXMLTree.getRoot(); + LLXmlTreeNode* root = xml_tree.getRoot(); if (!root) { LL_ERRS() << "No root node found in avatar configuration file: " << avatar_file_name << LL_ENDL; @@ -463,7 +463,6 @@ void LLAvatarAppearance::cleanupClass() delete_and_clear(sAvatarDictionary); delete_and_clear(sAvatarSkeletonInfo); sSkeletonXMLTree.cleanup(); - sXMLTree.cleanup(); } using namespace LLAvatarAppearanceDefines; diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h index d16aeccf0d..4f497c0887 100644 --- a/indra/llappearance/llavatarappearance.h +++ b/indra/llappearance/llavatarappearance.h @@ -211,7 +211,6 @@ public: // XML parse tree //-------------------------------------------------------------------- protected: - static LLXmlTree sXMLTree; // avatar config file static LLXmlTree sSkeletonXMLTree; // avatar skeleton file static LLAvatarSkeletonInfo* sAvatarSkeletonInfo; |