Automated merge with ssh://bitbucket.org/lindenlab/viewer-skip-llcorehttp-test

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 87c3c5042b..e1f51e62e3 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -872,8 +872,15 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
         ++items_iter)
     {
         LLViewerInventoryCategory *cat = gInventory.getCategory(*items_iter);
-        if (!cat) return;
-
+        if (!cat)
+        {
+            LLInventoryObject* obj = gInventory.getObject(*items_iter);
+            if(!obj || (obj->getType() != LLAssetType::AT_CATEGORY))
+            {
+                return;
+            }
+            cat = (LLViewerInventoryCategory*)obj;
+        }
         std::string name = cat->getName();
 
         updateChangedCategoryName(cat, name);