Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply Aleric's fix for Issue 1810: Import of XML shape data from Avastar

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-31 06:47:24 -05:00
parent d44d6515d8
commit 43e1aa9c01
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloatercustomize.cpp
View File

@@ -346,13 +346,12 @@ void LLFloaterCustomize::onBtnImport_continued(AIFilePicker* filepicker)
// <linden_genepool version="1.0" [metaversion="?"]> (root) // <linden_genepool version="1.0" [metaversion="?"]> (root)
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
std::string metaversion; std::string metaversion;
U32 metaversion_major; U32 metaversion_major = 0; // No metaversion
AIXMLParser linden_genepool(filename, "wearable import file", "linden_genepool", 1); AIXMLParser linden_genepool(filename, "wearable import file", "linden_genepool", 1);
linden_genepool.attribute("version", "1.0"); linden_genepool.attribute("version", "1.0");
linden_genepool.attribute("metaversion", metaversion);
if (!LLStringUtil::convertToU32(metaversion, metaversion_major) || metaversion_major > 1) if (linden_genepool.attribute("metaversion", metaversion) && (!LLStringUtil::convertToU32(metaversion, metaversion_major) || metaversion_major > 1))
{ {
THROW_MALERT("AIXMLImportRootVersionError", args("[TAG]", "metaversion")("[VERSIONMAJOR]", "1")); THROW_MALERT("AIXMLImportRootVersionError", args("[TAG]", "metaversion")("[VERSIONMAJOR]", "1"));
} }