diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-22 23:31:22 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-22 23:31:22 +0300 |
| commit | fa887f18e1a251fb29b93880cefda463ea2baec4 (patch) | |
| tree | 4ed4548e29144ecc1e5d60001be34f9630ef67fb /indra | |
| parent | 825cfc2b6a2711bdf8b4a3360f379d5fa628a421 (diff) | |
follow-up build fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 1 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 07a91b312c..c202333f45 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -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; diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 1ff955644c..976ef61d8e 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -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 { |