livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

follow-up build fix

master
Andrey Lihatskiy 2020-09-22 23:31:22 +03:00
parent 825cfc2b6a
commit fa887f18e1
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llinventorypanel.h
View File

@ -405,7 +405,6 @@ public:
std::string& tooltip_msg) override;
protected:
/*virtual*/ LLFolderViewItem* buildNewViews(const LLUUID& id) override;
/*virtual*/ bool typedViewsFilter(const LLUUID& id, LLInventoryObject const* objectp) override;
/*virtual*/ void itemChanged(const LLUUID& item_id, U32 mask, const LLInventoryObject* model_item) override;

1
indra/newview/llvoicevivox.cpp
View File

@ -1111,7 +1111,6 @@ bool LLVivoxVoiceClient::establishVoiceConnection()
timeout *= retries;
LL_INFOS("Voice") << "Retry connection to voice service in " << timeout << " seconds" << LL_ENDL;
llcoro::suspendUntilTimeout(timeout);
quiting = LLApp::isExiting();
if (mVoiceEnabled) // user may have switched it off
{