summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2022-04-01 15:59:39 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2022-04-01 15:59:39 +0300
commit9f102ad748cf61fc0f0b44ab785766e046bfdaf5 (patch)
treedc231609757ec370d167c29b0f6d3dfb071ade57 /indra
parenta41855ac54229385c612f48bc1adf184db526460 (diff)
SL-17106 Show self avatar in Nearby tab if same string is not excluded from search
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloateravatarpicker.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index ab95bc06b8..0186c4aebe 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -105,6 +105,7 @@ LLFloaterAvatarPicker::LLFloaterAvatarPicker(const LLSD& key)
mNumResultsReturned(0),
mNearMeListComplete(FALSE),
mCloseOnSelect(FALSE),
+ mExcludeAgentFromSearchResults(FALSE),
mContextConeOpacity (0.f),
mContextConeInAlpha(0.f),
mContextConeOutAlpha(0.f),
@@ -295,7 +296,7 @@ void LLFloaterAvatarPicker::populateNearMe()
for(U32 i=0; i<avatar_ids.size(); i++)
{
LLUUID& av = avatar_ids[i];
- if(av == gAgent.getID()) continue;
+ if(mExcludeAgentFromSearchResults && (av == gAgent.getID())) continue;
LLSD element;
element["id"] = av; // value
LLAvatarName av_name;