Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

1 files changed, 6 insertions, 29 deletions

diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp
index ef488e9ef4..5373400e9d 100644
--- a/indra/newview/lllocalgltfmaterials.cpp
+++ b/indra/newview/lllocalgltfmaterials.cpp
@@ -39,7 +39,6 @@
 #include <ctime>
 
 /* misc headers */
-#include "llfilepicker.h"
 #include "llgltfmateriallist.h"
 #include "llimage.h"
 #include "llinventoryicon.h"
@@ -363,51 +362,29 @@ LLLocalGLTFMaterialMgr::~LLLocalGLTFMaterialMgr()
     mMaterialList.clear();
 }
 
-bool LLLocalGLTFMaterialMgr::addUnit()
-{
-    bool add_successful = false;
-
-    LLFilePicker& picker = LLFilePicker::instance();
-    if (picker.getMultipleOpenFiles(LLFilePicker::FFLOAD_MATERIAL))
-    {
-        mTimer.stopTimer();
-
-        std::string filename = picker.getFirstFile();
-        while (!filename.empty())
-        {
-            add_successful |= addUnit(filename);
-            filename = picker.getNextFile();
-        }
-
-        mTimer.startTimer();
-    }
-
-    return add_successful;
-}
-
 bool LLLocalGLTFMaterialMgr::addUnit(const std::vector<std::string>& filenames)
 {
     bool add_successful = false;
     std::vector<std::string>::const_iterator iter = filenames.begin();
     while (iter != filenames.end())
     {
-        if (!iter->empty())
+        if (!iter->empty() && addUnit(*iter).notNull())
         {
-            add_successful |= addUnit(*iter);
+            add_successful = true;
         }
         iter++;
     }
     return add_successful;
 }
 
-bool LLLocalGLTFMaterialMgr::addUnit(const std::string& filename)
+LLUUID LLLocalGLTFMaterialMgr::addUnit(const std::string& filename)
 {
     LLLocalGLTFMaterial* unit = new LLLocalGLTFMaterial(filename);
 
     if (unit->getValid())
     {
         mMaterialList.push_back(unit);
-        return true;
+        return unit->getTrackingID();
     }
     else
     {
@@ -420,9 +397,9 @@ bool LLLocalGLTFMaterialMgr::addUnit(const std::string& filename)
 
         delete unit;
         unit = NULL;
-
-        return false;
     }
+
+    return LLUUID::null;
 }
 
 void LLLocalGLTFMaterialMgr::delUnit(LLUUID tracking_id)