diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index e9647bbbb115385bcdf3f119eb8858dfc609e2e3..0fa3de28008d002055f74575949b566fdca6c793 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -1139,7 +1139,6 @@ void LLAudioEngine::startNextTransfer()
if (asset_id.isNull())
{
max_pri = -1.f;
- source_map::iterator source_iter;
for (source_map::value_type& source_pair : mAllSources)
{
asp = source_pair.second;
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 03e41ac8cc41c72eda21105820433b6e17302ce5..6381a85994daa8a930896ae6cda66588aa078c32 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1760,7 +1760,7 @@ BOOL LLFloater::handleDoubleClick(S32 x, S32 y, MASK mask)
}
else if ( (mHeaderHeight > 0) && (mDragHandle) && (mButtons[BUTTON_COLLAPSE]) && (mButtons[BUTTON_COLLAPSE]->getVisible()) && (mButtons[BUTTON_COLLAPSE]->getEnabled()) &&
( ((!mDragOnLeft) && (mDragHandle->getRect().mTop >= y) && (mDragHandle->getRect().mTop - mHeaderHeight <= y)) ||
- (mDragOnLeft) && (mDragHandle->getRect().pointInRect(x,y))) )
+ ((mDragOnLeft) && (mDragHandle->getRect().pointInRect(x,y)))) )
{
setCollapsed(true);
return TRUE;
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 86f08b8e1c757ed843279de4c2fa1f6dc81d91fb..2044328b7ea216b334043f5d4691db9f566c4de8 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -479,7 +479,9 @@ LLAgent::LLAgent() :
mCrouch(false),
mVoiceConnected(false),
+#if OPENSIM
mAppearanceSerialNum(0),
+#endif
mMouselookModeInSignal(NULL),
mMouselookModeOutSignal(NULL)
{
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index ebf11af8dbc2c0259edd09286c28ab8074c53d42..89c65ba1779ace5e76611f931fed90dd32f97ad6 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -866,7 +866,9 @@ class LLAgent final : public LLOldEvents::LLObservable
private:
BOOL mShowAvatar; // Should we render the avatar?
+#if OPENSIM
U32 mAppearanceSerialNum;
+#endif
//--------------------------------------------------------------------
// Rendering state bitmap helpers
diff --git a/indra/newview/llderenderlist.cpp b/indra/newview/llderenderlist.cpp
index 78f28c481d6e9b289e9046f91eb54728f54289d5..1e11a2d17b22c3392f3e80f09b1f27493db28b3c 100644
--- a/indra/newview/llderenderlist.cpp
+++ b/indra/newview/llderenderlist.cpp
@@ -260,6 +260,10 @@ void LLDerenderList::removeObjects(LLDerenderEntry::EEntryType eType, const uuid
}
}
break;
+ default:
+ case LLDerenderEntry::TYPE_AVATAR:
+ case LLDerenderEntry::TYPE_NONE:
+ break;
}
fSave |= pEntry->isPersistent();
diff --git a/indra/newview/llfloaterblocked.h b/indra/newview/llfloaterblocked.h
index 23cc04bb34722e07f679973834053cc252f6b471..dbc1618892c5d9e0a982ab455f2e76176c944c0a 100644
--- a/indra/newview/llfloaterblocked.h
+++ b/indra/newview/llfloaterblocked.h
@@ -53,7 +53,7 @@ class LLPanelBlockBase
// LLPanelBlockList
//
-class LLPanelBlockList : public LLPanel, public LLMuteListObserver, public LLPanelBlockBase
+class LLPanelBlockList final : public LLPanel, public LLMuteListObserver, public LLPanelBlockBase
{
public:
LLPanelBlockList();
@@ -73,7 +73,7 @@ class LLPanelBlockList : public LLPanel, public LLMuteListObserver, public LLPan
const std::string& getFilterString() const override { return m_strFilter; }
void setFilterString(const std::string& strFilter) override;
protected:
- void refresh();
+ void refresh() override;
void removePicker();
void selectEntry(const LLSD& sdValue) { LLMute muteEntry(sdValue["id"].asUUID(), sdValue["name"].asString()); selectEntry(muteEntry); }
void selectEntry(const LLMute& muteEntry);
@@ -83,7 +83,7 @@ class LLPanelBlockList : public LLPanel, public LLMuteListObserver, public LLPan
* Event handlers
*/
public:
- void onChange() override;
+ void onChange() override;
protected:
void onAddAvatar(LLUICtrl* pCtrl);
static void onAddAvatarCallback(const uuid_vec_t& idAgents, const std::vector<LLAvatarName>& avAgents);
@@ -110,7 +110,7 @@ class LLPanelBlockList : public LLPanel, public LLMuteListObserver, public LLPan
// LLPanelDerenderList
//
-class LLPanelDerenderList : public LLPanel
+class LLPanelDerenderList final : public LLPanel
{
public:
LLPanelDerenderList();
@@ -127,7 +127,7 @@ class LLPanelDerenderList : public LLPanel
* Member functions
*/
protected:
- void refresh();
+ void refresh() override;
/*
* Event handlers
@@ -149,7 +149,7 @@ class LLPanelDerenderList : public LLPanel
// LLPanelAvatarRendering - Configure avatar complexity excpetions
//
-class LLPanelAvatarRendering : public LLPanel, public LLMuteListObserver, public LLPanelBlockBase
+class LLPanelAvatarRendering final : public LLPanel, public LLMuteListObserver, public LLPanelBlockBase
{
friend class LLPanelAvatarRenderingContextMenu;
public:
@@ -170,7 +170,7 @@ class LLPanelAvatarRendering : public LLPanel, public LLMuteListObserver, public
const std::string& getFilterString() const override { return m_strFilter; }
void setFilterString(const std::string& strFilter) override;
protected:
- void refresh();
+ void refresh() override;
void removePicker();
void updateButtons();
@@ -206,7 +206,7 @@ class LLPanelAvatarRendering : public LLPanel, public LLMuteListObserver, public
// LLFloaterBlocked
//
-class LLFloaterBlocked : public LLFloater
+class LLFloaterBlocked final : public LLFloater
{
public:
LLFloaterBlocked(const LLSD& sdKey);
diff --git a/indra/newview/llfloaterdirectory.cpp b/indra/newview/llfloaterdirectory.cpp
index 728df9be3212a872d763d24019692667527ea62f..8950509f4d841bc5d4d4d39df530b7cbce079efb 100644
--- a/indra/newview/llfloaterdirectory.cpp
+++ b/indra/newview/llfloaterdirectory.cpp
@@ -958,7 +958,6 @@ void LLFloaterDirectory::processSearchLandReply(LLMessageSystem* msg, void**)
}
self->mNumResultsReceived += num_new_rows;
- S32 not_auction = 0;
for (S32 i = 0; i < num_new_rows; ++i)
{
msg->getUUID( "QueryReplies", "ParcelID", parcel_id, i);
@@ -1018,7 +1017,6 @@ void LLFloaterDirectory::processSearchLandReply(LLMessageSystem* msg, void**)
if (!auction)
{
buffer = llformat("%d", price);
- not_auction++;
}
element["columns"][2]["column"] = "price";
element["columns"][2]["value"] = price;
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 423896f3116219b2ccec3d9eca6da05c62a081e0..76f427ac1c1b81adcc6b98cc1918b7e018d31863 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -624,16 +624,24 @@ bool LLInventoryFilter::checkAgainstSearchVisibility(const LLFolderViewModelItem
const BOOL is_link = object->getIsLinkType();
if (is_link && ((mFilterOps.mSearchVisibility & VISIBILITY_LINKS) == 0))
+ {
return FALSE;
+ }
if (listener->isItemInOutfits() && ((mFilterOps.mSearchVisibility & VISIBILITY_OUTFITS) == 0))
- return FALSE;
+ {
+ return FALSE;
+ }
if (listener->isItemInTrash() && ((mFilterOps.mSearchVisibility & VISIBILITY_TRASH) == 0))
+ {
return FALSE;
+ }
if (!listener->isAgentInventory() && ((mFilterOps.mSearchVisibility & VISIBILITY_LIBRARY) == 0))
+ {
return FALSE;
+ }
return TRUE;
}
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index b11b37e0077e7d109f8fadb48e76e08af948baa5..e63db860577cce7639df275819d8967fbb0f53c4 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2420,7 +2420,7 @@ void LLInventoryGallery::startDrag()
ids.push_back(selected_id);
}
}
- LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, LLToolDragAndDrop::SOURCE_AGENT);
+ LLToolDragAndDrop::getInstance()->beginMultiDrag(types, ids, src);
}
bool LLInventoryGallery::areViewsInitialized()
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 5f4b816b99b6715cc2be45fbe33ae68b40eef78d..bfa87a9834ddbef7ae30da87a1ddab2d5cc7b55c 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -564,7 +564,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
items.push_back(std::string("Copy Asset UUID"));
items.push_back(std::string("Copy Separator"));
- bool is_asset_knowable = is_asset_knowable = LLAssetType::lookupIsAssetIDKnowable(obj->getType());
+ bool is_asset_knowable = LLAssetType::lookupIsAssetIDKnowable(obj->getType());
if ( !is_asset_knowable // disable menu item for Inventory items with unknown asset. EXT-5308
|| (! ( is_full_perm_item || gAgent.isGodlike())))
{
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index fd8e62224a0008b5a7bb3055c590a33040f2d0b3..647f461aaf08c303358d48ed8bcbd1b37836ed9c 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -173,18 +173,18 @@ class LLNameListCtrl
/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL drop, EDragAndDropType cargo_type, void *cargo_data,
EAcceptance *accept,
- std::string& tooltip_msg);
- /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask);
+ std::string& tooltip_msg) override;
+ /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) override;
void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
void sortByName(BOOL ascending);
- /*virtual*/ void updateColumns(bool force_update);
+ /*virtual*/ void updateColumns(bool force_update) override;
- /*virtual*/ void mouseOverHighlightNthItem( S32 index );
+ /*virtual*/ void mouseOverHighlightNthItem( S32 index ) override;
- /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
bool isSpecialType() { return (mNameListType == SPECIAL); }
diff --git a/indra/newview/llviewerstatsrecorder.cpp b/indra/newview/llviewerstatsrecorder.cpp
index 6372679a07d679560822b030c9b8f98606f24eec..c671f8c634caa2ce6da7c46eba7a6860d3c9655d 100644
--- a/indra/newview/llviewerstatsrecorder.cpp
+++ b/indra/newview/llviewerstatsrecorder.cpp
@@ -161,7 +161,9 @@ void LLViewerStatsRecorder::writeToLog( F32 interval )
size_t data_size = 0;
F64 delta_time = LLFrameTimer::getTotalSeconds() - mLastSnapshotTime;
if (delta_time < interval)
- return;
+ {
+ return;
+ }
if (mSkipSaveIfZeros)
{