Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buncha assorted changes

Browse Source
This commit is contained in:
Liru Færs
2019-11-24 00:32:58 -05:00
parent 1b913443ad
commit 84081286f0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfavoritesbar.cpp
View File

@@ -1130,7 +1130,7 @@ BOOL LLFavoritesBarCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
show_navbar_context_menu(this,x,y); show_navbar_context_menu(this,x,y);
handled = true; handled = true;
}*/ }*/
return handled; return handled;
} }
void copy_slurl_to_clipboard_cb(std::string& slurl) void copy_slurl_to_clipboard_cb(std::string& slurl)

2
indra/newview/llfloateravatarlist.cpp
View File

@@ -1246,7 +1246,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
// static // static
void LLFloaterAvatarList::setFocusAvatar(const LLUUID& id) 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()) if (auto inst = getIfExists())
inst->setFocusAvatarInternal(id); inst->setFocusAvatarInternal(id);
} }

2
indra/newview/llfloatermarketplacelistings.cpp
View File

@@ -53,6 +53,8 @@ static LLPanelInjector<LLPanelMarketplaceListings> t_panel_status("llpanelmarket
LLPanelMarketplaceListings::LLPanelMarketplaceListings() LLPanelMarketplaceListings::LLPanelMarketplaceListings()
: mRootFolder(NULL) : mRootFolder(NULL)
, mAuditBtn(nullptr)
, mFilterEditor(nullptr)
, mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME) , mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME)
, mFilterListingFoldersOnly(false) , mFilterListingFoldersOnly(false)
{ {