diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-16 16:25:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-16 16:25:38 -0500 |
| commit | 09f3d6eaeea79aa2e46644cfb4badd11d429525b (patch) | |
| tree | 6f2d915bbf8bdb95466943e4d9ac377cee823440 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 8dc59e5ef37836b15d478fb0d04e3043a9f986de (diff) | |
| parent | 1478cacfcda16162bd3d854a275afcc6a41852dd (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 3 |
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; |