From 80cd8166ad0e86a7906efe201ccad596f3ff1735 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sat, 7 Nov 2020 02:01:02 -0500
Subject: [PATCH] Yet more unused variable warnings..
---
indra/newview/alpanelquicksettings.cpp | 1 -
indra/newview/alpanelquicksettings.h | 2 --
indra/newview/llattachmentsmgr.cpp | 1 -
indra/newview/llfloatergodtools.cpp | 1 -
indra/newview/llfloaterinspect.cpp | 1 -
indra/newview/llfloateroutfitphotopreview.cpp | 1 -
indra/newview/llfloaterregioninfo.cpp | 1 -
indra/newview/llinventorymodel.cpp | 4 ++--
indra/newview/llpanelgroupgeneral.cpp | 2 --
indra/newview/llpanelobject.cpp | 3 ---
indra/newview/llselectmgr.cpp | 3 ---
indra/newview/llspeakers.cpp | 3 +--
indra/newview/lltooldraganddrop.cpp | 1 -
indra/newview/llviewerinventory.cpp | 1 -
indra/newview/llviewermessage.cpp | 1 -
indra/newview/llvoavatar.cpp | 7 ++++---
16 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/indra/newview/alpanelquicksettings.cpp b/indra/newview/alpanelquicksettings.cpp
index 2dc4d015819..43b4b26fca9 100644
--- a/indra/newview/alpanelquicksettings.cpp
+++ b/indra/newview/alpanelquicksettings.cpp
@@ -43,7 +43,6 @@ static LLPanelInjector<ALPanelQuickSettings> t_quick_settings("quick_settings");
ALPanelQuickSettings::ALPanelQuickSettings()
: LLPanel(),
- mRegionSettingsCheckBox(nullptr),
mHoverSlider(nullptr),
mHoverSpinner(nullptr)
{
diff --git a/indra/newview/alpanelquicksettings.h b/indra/newview/alpanelquicksettings.h
index fca55b8e3b7..504fc5c28a1 100644
--- a/indra/newview/alpanelquicksettings.h
+++ b/indra/newview/alpanelquicksettings.h
@@ -52,8 +52,6 @@ class ALPanelQuickSettings final : public LLPanel
void onSimulatorFeaturesReceived(const LLUUID ®ion_id);
void updateEditHoverEnabled();
- LLCheckBoxCtrl* mRegionSettingsCheckBox;
-
LLSlider* mHoverSlider;
LLSpinCtrl* mHoverSpinner;
diff --git a/indra/newview/llattachmentsmgr.cpp b/indra/newview/llattachmentsmgr.cpp
index 0d51d581dbb..1005ca95295 100644
--- a/indra/newview/llattachmentsmgr.cpp
+++ b/indra/newview/llattachmentsmgr.cpp
@@ -43,7 +43,6 @@
const F32 COF_LINK_BATCH_TIME = 5.0F;
const F32 MAX_ATTACHMENT_REQUEST_LIFETIME = 30.0F;
const F32 MIN_RETRY_REQUEST_TIME = 5.0F;
-const F32 MAX_BAD_COF_TIME = 30.0F;
// [SL:KB] - Patch: Appearance-SyncAttach | Checked: Catznip-3.7
class LLRegisterAttachmentCallback : public LLRequestServerAppearanceUpdateOnDestroy
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index de32af8016b..0cd41d509b2 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -224,7 +224,6 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
S32 price_per_meter;
S32 redirect_grid_x;
S32 redirect_grid_y;
- LLUUID cache_id;
LLHost host = msg->getSender();
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 57a05b42fcf..b7c1700526f 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -279,7 +279,6 @@ LLUUID LLFloaterInspect::getSelectedUUID()
void LLFloaterInspect::refresh()
{
- LLUUID creator_id;
std::string creator_name;
S32 pos = mObjectList->getScrollPos();
getChildView("button owner")->setEnabled(false);
diff --git a/indra/newview/llfloateroutfitphotopreview.cpp b/indra/newview/llfloateroutfitphotopreview.cpp
index 6c39db730c3..ade258aef74 100644
--- a/indra/newview/llfloateroutfitphotopreview.cpp
+++ b/indra/newview/llfloateroutfitphotopreview.cpp
@@ -234,7 +234,6 @@ void LLFloaterOutfitPhotoPreview::updateImageID()
if(item)
{
mImageID = item->getAssetUUID();
- LLPermissions perm(item->getPermissions());
}
else
{
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 20c78abe05a..ac2fc67e7bf 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2463,7 +2463,6 @@ bool LLDispatchSetEstateExperience::operator()(
++it; // U32 estate_id = strtol((*it).c_str(), NULL, 10);
++it; // U32 send_to_agent_only = strtoul((*(++it)).c_str(), NULL, 10);
- LLUUID id;
S32 num_blocked = strtol((*(it++)).c_str(), NULL, 10);
S32 num_trusted = strtol((*(it++)).c_str(), NULL, 10);
S32 num_allowed = strtol((*(it++)).c_str(), NULL, 10);
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 32054a79baf..61da3572e7d 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -3054,7 +3054,7 @@ void LLInventoryModel::removeInventoryItem(LLUUID agent_id, LLMessageSystem* msg
void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**)
{
LL_DEBUGS(LOG_INV) << "LLInventoryModel::processRemoveInventoryItem()" << LL_ENDL;
- LLUUID agent_id, item_id;
+ LLUUID agent_id;
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
if(agent_id != gAgent.getID())
{
@@ -3071,7 +3071,7 @@ void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg,
void**)
{
LL_DEBUGS(LOG_INV) << "LLInventoryModel::processUpdateInventoryFolder()" << LL_ENDL;
- LLUUID agent_id, folder_id, parent_id;
+ LLUUID agent_id;
//char name[DB_INV_ITEM_NAME_BUF_SIZE];
msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id);
if(agent_id != gAgent.getID())
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 375daf60f88..0884fdbc670 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -459,8 +459,6 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if (is_member)
{
- LLUUID current_title_role;
-
mComboActiveTitle->clear();
mComboActiveTitle->removeall();
bool has_selected_title = false;
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 19458f51759..615c85586ff 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -1077,9 +1077,6 @@ void LLPanelObject::getState( )
// sculpt texture
if (selected_item == MI_SCULPT)
{
-
-
- LLUUID id;
LLSculptParams *sculpt_params = (LLSculptParams *)objectp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 71c3ea938ef..1a327a3778a 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5352,7 +5352,6 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data
LLUUID group_id;
LLUUID last_owner_id;
U64 creation_date;
- LLUUID extra_id;
U32 base_mask, owner_mask, group_mask, everyone_mask, next_owner_mask;
LLSaleInfo sale_info;
LLCategory category;
@@ -5512,10 +5511,8 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
LLUUID id;
U32 request_flags;
- LLUUID creator_id;
LLUUID owner_id;
LLUUID group_id;
- LLUUID extra_id;
U32 base_mask, owner_mask, group_mask, everyone_mask, next_owner_mask;
LLSaleInfo sale_info;
LLCategory category;
diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp
index 33517f3c3ba..e1bd1892e17 100644
--- a/indra/newview/llspeakers.cpp
+++ b/indra/newview/llspeakers.cpp
@@ -458,8 +458,7 @@ void LLSpeakerMgr::update(BOOL resort_ok)
S32 recent_speaker_count = 0;
S32 sort_index = 0;
- speaker_list_t::iterator sorted_speaker_it;
- for(LLPointer<LLSpeaker> speakerp : mSpeakersSorted)
+ for(LLPointer<LLSpeaker>& speakerp : mSpeakersSorted)
{
// color code recent speakers who are not currently speaking
if (speakerp->mStatus == LLSpeaker::STATUS_HAS_SPOKEN)
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 45210a91681..f65ae6d6378 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -2176,7 +2176,6 @@ EAcceptance LLToolDragAndDrop::dad3dActivateGesture(
if( drop )
{
- LLUUID item_id;
if(mSource == SOURCE_LIBRARY)
{
// create item based on that one, and put it on if that
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index eb4b5023912..c0120ebc281 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -81,7 +81,6 @@ void no_op_llsd_func(const LLSD&) {}
void no_op() {}
static const char * const LOG_INV("Inventory");
-static const char * const LOG_LOCAL("InventoryLocalize");
static const char * const LOG_NOTECARD("copy_inventory_from_notecard");
#if 1
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 733fd8190c7..06f8797a6cb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2405,7 +2405,6 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
LLUUID fid;
- LLUUID from_id;
LLMessageSystem* msg = gMessageSystem;
switch(option)
{
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 8caedc7706c..4a9b47aa8eb 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1,4 +1,4 @@
-/**
+/**
* @File llvoavatar.cpp
* @brief Implementation of LLVOAvatar class which is a derivation of LLViewerObject
*
@@ -1969,7 +1969,6 @@ void LLVOAvatar::resetVisualParams()
{
// Skeletal params
{
- LLAvatarXmlInfo::skeletal_distortion_info_list_t::iterator iter;
for (LLViewerVisualParamInfo* vparam : sAvatarXmlInfo->mSkeletalDistortionInfoList)
{
LLPolySkeletalDistortionInfo *info = static_cast<LLPolySkeletalDistortionInfo*>(vparam);
@@ -9169,9 +9168,11 @@ void LLVOAvatar::applyParsedAppearanceMessage(LLAppearanceMessageContents& conte
}
}
}
+
+#ifdef SHOW_DEBUG
const S32 expected_tweakable_count = getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TWEAKABLE) +
getVisualParamCountInGroup(VISUAL_PARAM_GROUP_TRANSMIT_NOT_TWEAKABLE); // don't worry about VISUAL_PARAM_GROUP_TWEAKABLE_NO_TRANSMIT
-#if SHOW_DEBUG
+
if (num_params != expected_tweakable_count)
{
LL_DEBUGS("Avatar") << "Number of params in AvatarAppearance msg (" << num_params << ") does not match number of tweakable params in avatar xml file (" << expected_tweakable_count << "). Processing what we can. object: " << getID() << LL_ENDL;
--
GitLab