diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llgenepool.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llgenepool.cpp')
-rw-r--r-- | linden/indra/newview/llgenepool.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/linden/indra/newview/llgenepool.cpp b/linden/indra/newview/llgenepool.cpp index 553bcad..a427af6 100644 --- a/linden/indra/newview/llgenepool.cpp +++ b/linden/indra/newview/llgenepool.cpp | |||
@@ -60,10 +60,9 @@ LLGenePool::~LLGenePool() | |||
60 | 60 | ||
61 | BOOL LLGenePool::load() | 61 | BOOL LLGenePool::load() |
62 | { | 62 | { |
63 | char filename[MAX_PATH]; /*Flawfinder: ignore*/ | 63 | std::string filename; |
64 | 64 | ||
65 | strncpy(filename,gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml").c_str(), sizeof(filename) -1); /*Flawfinder: ignore*/ | 65 | filename = gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"genepool.xml"); |
66 | filename[sizeof(filename) -1] = '\0'; | ||
67 | if( mLoaded ) | 66 | if( mLoaded ) |
68 | { | 67 | { |
69 | return TRUE; | 68 | return TRUE; |
@@ -91,7 +90,7 @@ BOOL LLGenePool::load() | |||
91 | return FALSE; | 90 | return FALSE; |
92 | } | 91 | } |
93 | 92 | ||
94 | LLString version; | 93 | std::string version; |
95 | static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version"); | 94 | static LLStdStringHandle version_string = LLXmlTree::addAttributeString("version"); |
96 | if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") ) | 95 | if( !root->getFastAttributeString( version_string, version ) || (version != "1.0") ) |
97 | { | 96 | { |