From 84081286f0de93421157e781ace2a53a3d6f38fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sun, 24 Nov 2019 00:32:58 -0500 Subject: [PATCH] Buncha assorted changes --- indra/newview/llfavoritesbar.cpp | 2 +- indra/newview/llfloateravatarlist.cpp | 2 +- indra/newview/llfloatermarketplacelistings.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 3ed58db98..254d750cb 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -1130,7 +1130,7 @@ BOOL LLFavoritesBarCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask) show_navbar_context_menu(this,x,y); handled = true; }*/ - + return handled; } void copy_slurl_to_clipboard_cb(std::string& slurl) diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 0f90007f0..7f4e8a8a3 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -1246,7 +1246,7 @@ void LLFloaterAvatarList::removeFocusFromAll() // static void LLFloaterAvatarList::setFocusAvatar(const LLUUID& id) { - if (!gAgentCamera.lookAtObject(id, false) && !lookAtAvatar(id)) return; + if (/*!gAgentCamera.lookAtObject(id, false) &&*/ !lookAtAvatar(id)) return; if (auto inst = getIfExists()) inst->setFocusAvatarInternal(id); } diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index b91e719e8..7081aa5bc 100644 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -53,6 +53,8 @@ static LLPanelInjector t_panel_status("llpanelmarket LLPanelMarketplaceListings::LLPanelMarketplaceListings() : mRootFolder(NULL) +, mAuditBtn(nullptr) +, mFilterEditor(nullptr) , mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME) , mFilterListingFoldersOnly(false) {