From 736549f03fbcd87542aff27dd587923d00ab681e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 9 Oct 2015 09:26:21 +0200 Subject: STORM-2122: UDP data bandwidth measuring is off by factor 8 --- doc/contributions.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index e67df2453e..fcadccab22 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -219,6 +219,7 @@ Ansariel Hiller STORM-2105 STORM-2151 MAINT-8085 + STORM-2122 Aralara Rajal Arare Chantilly CHUIBUG-191 -- cgit v1.3 From 84222286ccb5ebb50e5f4da2dd5d4e87253b37d4 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Thu, 9 Nov 2017 23:05:35 +0200 Subject: MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters --- doc/contributions.txt | 1 + indra/newview/pipeline.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/contributions.txt b/doc/contributions.txt index c98c974e62..88322bdfe1 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -217,6 +217,7 @@ Ansariel Hiller MAINT-6519 MAINT-7899 STORM-2105 + MAINT-6917 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 1d083bb2fd..2f17fb54ad 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -11622,7 +11622,7 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar) avatar->setImpostorDim(tdim); - LLVOAvatar::sUseImpostors = true; // @TODO ??? + LLVOAvatar::sUseImpostors = (0 != LLVOAvatar::sMaxNonImpostors); sUseOcclusion = occlusion; sReflectionRender = false; sImpostorRender = false; -- cgit v1.3 From 2269a9f0747173a24b2c8463f8a20a7b40bc8833 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 17 Jan 2018 13:31:26 +0100 Subject: MAINT-8085 done right --- doc/contributions.txt | 1 + indra/newview/llfilteredwearablelist.cpp | 6 ++++++ indra/newview/llwearableitemslist.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'doc') 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 -- cgit v1.3