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

These changes look harmless

Browse Source
This commit is contained in:
Liru Færs
2021-02-14 12:43:19 -05:00
parent d49c38bf18
commit 246db973b4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llmenucommands.cpp
View File

@@ -140,7 +140,7 @@ struct CommWrapper
static bool only_comm() static bool only_comm()
{ {
static const LLCachedControl<bool> only("CommunicateSpecificShortcut"); static const LLCachedControl<bool> only("CommunicateSpecificShortcut");
return only || LLFloaterChatterBox::getInstance()->getFloaterCount(); return only || LLFloaterChatterBox::instance().getFloaterCount();
} }
static bool instanceVisible(const LLSD& key) { return only_comm() ? LLFloaterChatterBox::instanceVisible(key) : LLFloaterMyFriends::instanceVisible(key); } static bool instanceVisible(const LLSD& key) { return only_comm() ? LLFloaterChatterBox::instanceVisible(key) : LLFloaterMyFriends::instanceVisible(key); }
static void toggleInstance(const LLSD& key) { only_comm() ? LLFloaterChatterBox::toggleInstance(key) : LLFloaterMyFriends::toggleInstance(key); } static void toggleInstance(const LLSD& key) { only_comm() ? LLFloaterChatterBox::toggleInstance(key) : LLFloaterMyFriends::toggleInstance(key); }
@@ -148,7 +148,7 @@ struct CommWrapper
struct MenuFloaterDict final : public LLSingleton<MenuFloaterDict> struct MenuFloaterDict final : public LLSingleton<MenuFloaterDict>
{ {
typedef std::map<const std::string, std::pair<std::function<void ()>, std::function<bool ()> > > menu_floater_map_t; typedef std::map<const std::string, std::pair<std::function<void ()>, std::function<bool ()>>> menu_floater_map_t;
menu_floater_map_t mEntries; menu_floater_map_t mEntries;
MenuFloaterDict() MenuFloaterDict()