diff options
| author | Ansariel <none@none> | 2018-01-17 13:31:26 +0100 |
|---|---|---|
| committer | Ansariel <none@none> | 2018-01-17 13:31:26 +0100 |
| commit | 2269a9f0747173a24b2c8463f8a20a7b40bc8833 (patch) | |
| tree | 79e582b57f2f7a335771f80222b056448c8bb62b | |
| parent | 15c62d9e713eb1d51cc063c4ec2fed1d1f4ca59c (diff) | |
MAINT-8085 done right
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfilteredwearablelist.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.cpp | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 92198918d3..e67df2453e 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -218,6 +218,7 @@ Ansariel Hiller MAINT-7899 STORM-2105 STORM-2151 + MAINT-8085 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/llfilteredwearablelist.cpp b/indra/newview/llfilteredwearablelist.cpp index e67a6a2b77..2bfaa1e5bc 100644 --- a/indra/newview/llfilteredwearablelist.cpp +++ b/indra/newview/llfilteredwearablelist.cpp @@ -32,6 +32,7 @@ #include "llinventoryitemslist.h" #include "llinventorymodel.h" #include "llviewerinventory.h" +#include "lltrans.h" LLFilteredWearableListManager::LLFilteredWearableListManager(LLInventoryItemsList* list, LLInventoryCollectFunctor* collector) @@ -118,6 +119,11 @@ void LLFilteredWearableListManager::populateList() // Probably will also need to get items from Library (waiting for reply in EXT-6724). + if (item_array.empty() && gInventory.isCategoryComplete(gInventory.getRootFolderID())) + { + mWearableList->setNoItemsCommentText(LLTrans::getString("NoneFound")); + } + mWearableList->refreshList(item_array); } diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 5fb3d62445..ee2270c323 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -645,7 +645,7 @@ LLWearableItemsList::LLWearableItemsList(const LLWearableItemsList::Params& p) setRightMouseDownCallback(boost::bind(&LLWearableItemsList::onRightClick, this, _2, _3)); } mWornIndicationEnabled = p.worn_indication_enabled; - setNoItemsCommentText(LLTrans::getString("NoneFound")); + setNoItemsCommentText(LLTrans::getString("LoadingData")); } // virtual |