diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp index c763b2905c..bf6c4eed0c 100644 --- a/indra/newview/ao.cpp +++ b/indra/newview/ao.cpp @@ -515,7 +515,6 @@ void FloaterAO::onClickRemove() BOOL FloaterAO::removeSetCallback(const LLSD& notification, const LLSD& response) { - std::string newSetName = response["message"].asString(); S32 option = LLNotificationsUtil::getSelectedOption(notification, response); if (option ==0 ) @@ -731,7 +730,6 @@ void FloaterAO::onClickNext() void FloaterAO::onClickMore() { LLRect fullSize = gSavedPerAccountSettings.getRect("floater_rect_animation_overrider_full"); - LLRect smallSize = getRect(); if (fullSize.getHeight() < getMinHeight()) { diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp index 7da46610f0..a63ede1456 100644 --- a/indra/newview/aoengine.cpp +++ b/indra/newview/aoengine.cpp @@ -34,16 +34,13 @@ #include "llagentcamera.h" #include "llanimationstates.h" #include "llassetstorage.h" -#include "llcommon.h" #include "llinventoryfunctions.h" // for ROOT_FIRESTORM_FOLDER #include "llinventorymodel.h" -#include "llinventoryobserver.h" #include "llnotificationsutil.h" #include "llstring.h" #include "llvfs.h" #include "llviewercontrol.h" #include "llviewerinventory.h" -#include "llinventorybridge.h" //#define ROOT_FIRESTORM_FOLDER "#Firestorm" //moved to llinventoryfunctions.h #define ROOT_AO_FOLDER "#AO" @@ -978,17 +975,18 @@ BOOL AOEngine::removeAnimation(const AOSet* set, AOSet::AOState* state, S32 inde LLInventoryModel::cat_array_t* cats; gInventory.getDirectDescendentsOf(set->getInventoryUUID(), cats, items); - for (S32 index = 0; index < cats->size(); ++index) + for (LLInventoryModel::cat_array_t::iterator it = cats->begin(); it != cats->end(); ++it) { + LLPointer cat = (*it); std::vector params; - LLStringUtil::getTokens(cats->at(index)->getName(), params, ":"); + LLStringUtil::getTokens(cat->getName(), params, ":"); std::string stateName = params[0]; if (state->mName.compare(stateName) == 0) { - LL_DEBUGS("AOEngine") << "folder found: " << cats->at(index)->getName() << " purging uuid " << cats->at(index)->getUUID() << LL_ENDL; + LL_DEBUGS("AOEngine") << "folder found: " << cat->getName() << " purging uuid " << cat->getUUID() << LL_ENDL; - purgeFolder(cats->at(index)->getUUID()); + purgeFolder(cat->getUUID()); state->mInventoryUUID.setNull(); break; } @@ -1192,9 +1190,9 @@ void AOEngine::update() for (S32 state_index = 0; state_index < stateCategories->size(); ++state_index) { - std::vector params; - LLStringUtil::getTokens(stateCategories->at(state_index)->getName(), params, ":"); - std::string stateName = params[0]; + std::vector state_params; + LLStringUtil::getTokens(stateCategories->at(state_index)->getName(), state_params, ":"); + std::string stateName = state_params[0]; AOSet::AOState* state = newSet->getStateByName(stateName); if (!state) @@ -1205,26 +1203,26 @@ void AOEngine::update() LL_DEBUGS("AOEngine") << "Reading state " << stateName << LL_ENDL; state->mInventoryUUID = stateCategories->at(state_index)->getUUID(); - for (U32 num = 1; num < params.size(); ++num) + for (U32 num = 1; num < state_params.size(); ++num) { - if (params[num] == "CY") + if (state_params[num] == "CY") { state->mCycle = TRUE; LL_DEBUGS("AOEngine") << "Cycle on" << LL_ENDL; } - else if (params[num] == "RN") + else if (state_params[num] == "RN") { state->mRandom = TRUE; LL_DEBUGS("AOEngine") << "Random on" << LL_ENDL; } - else if (params[num].substr(0, 2) == "CT") + else if (state_params[num].substr(0, 2) == "CT") { - LLStringUtil::convertToS32(params[num].substr(2, params[num].size() - 2), state->mCycleTime); + LLStringUtil::convertToS32(state_params[num].substr(2, state_params[num].size() - 2), state->mCycleTime); LL_DEBUGS("AOEngine") << "Cycle Time specified:" << state->mCycleTime << LL_ENDL; } else { - LL_WARNS("AOEngine") << "Unknown AO set option " << params[num] << LL_ENDL; + LL_WARNS("AOEngine") << "Unknown AO set option " << state_params[num] << LL_ENDL; } } diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index d163d5c7cf..ab2e8efb2d 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -45,7 +45,6 @@ #include "fsfloaternearbychat.h" // [FS communication UI] #include "llfloaterreg.h" -#include "llfloatersidepanelcontainer.h" #include "llinventorymodel.h" #include "llnotificationmanager.h" #include "llparcel.h" @@ -522,15 +521,15 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge else if (command == sFSCmdLineMedia()) { std::string url; - std::string type; + std::string media_type; - if (i >> url && i >> type) + if (i >> url && i >> media_type) { LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if (parcel) { parcel->setMediaURL(url); - parcel->setMediaType(type); + parcel->setMediaType(media_type); if (gSavedSettings.getBOOL("MediaEnableFilter")) { LLViewerParcelMedia::filterMediaUrl(parcel); @@ -974,7 +973,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge reportToNearbyChat("Zdrop cannot work if the folder is inside another folder."); } } - catch (std::out_of_range e) + catch (std::out_of_range) { reportToNearbyChat("The Zdrop command transfers items from your inventory to a rezzed prim without the need to wait for the contents of the prim to load. No-copy items are moved to the prim. All other items are copied."); reportToNearbyChat("Valid command: Zdrop (rezzed prim UUID) (source inventory folder name)"); @@ -1048,7 +1047,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge reportToNearbyChat("Ztake cannot work if the folder is inside another folder."); } } - catch (std::out_of_range e) + catch (std::out_of_range) { reportToNearbyChat("Please specify a destination folder in your inventory."); } @@ -1117,7 +1116,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge reportToNearbyChat("The packager cannot work if the folder is inside another folder."); } } - catch (std::out_of_range e) + catch (std::out_of_range) { reportToNearbyChat("Please specify a destination folder in your inventory."); } @@ -1165,7 +1164,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge reportToNearbyChat("Mtake cannot work if the folder is inside another folder."); } } - catch (std::out_of_range e) + catch (std::out_of_range) { reportToNearbyChat("Please specify a destination folder in your inventory."); } diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index 39ec1a4c78..a233c79672 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -46,7 +46,6 @@ #include "llsaleinfo.h" #include "llcheckboxctrl.h" #include "llviewermenu.h" // handle_object_touch(), handle_buy() -#include "llclickaction.h" #include "lltabcontainer.h" #include "llspinctrl.h" #include "lltoolgrab.h" @@ -1074,8 +1073,8 @@ void FSAreaSearch::callbackLoadFullName(const LLUUID& id, const std::string& ful { if (object_it->second.name_requested && !object_it->second.listed) { - LLUUID id = object_it->second.id; - LLViewerObject* objectp = gObjectList.findObject(id); + LLUUID object_id = object_it->second.id; + LLViewerObject* objectp = gObjectList.findObject(object_id); if (objectp && isSearchableObject(objectp, our_region)) { matchObject(object_it->second, objectp); diff --git a/indra/newview/fsavatarsearchmenu.cpp b/indra/newview/fsavatarsearchmenu.cpp index c14770caf2..8b8df5cf6d 100644 --- a/indra/newview/fsavatarsearchmenu.cpp +++ b/indra/newview/fsavatarsearchmenu.cpp @@ -29,11 +29,9 @@ #include "fsavatarsearchmenu.h" -#include "fsradar.h" #include "llagent.h" #include "llavataractions.h" #include "llcallingcard.h" -#include "llfloaterreg.h" #include "lluictrl.h" #include "llviewermenu.h" #include "rlvhandler.h" diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp index 194f42a8a3..39f44e9d15 100644 --- a/indra/newview/fscommon.cpp +++ b/indra/newview/fscommon.cpp @@ -37,7 +37,6 @@ #include "lllogchat.h" #include "llmutelist.h" #include "llnotificationmanager.h" -#include "llnotificationsutil.h" // reportToNearbyChat #include "lltooldraganddrop.h" #include "llviewerinventory.h" #include "llviewernetwork.h" diff --git a/indra/newview/fsconsoleutils.cpp b/indra/newview/fsconsoleutils.cpp index 407b1eb8c5..a5a7a131bc 100644 --- a/indra/newview/fsconsoleutils.cpp +++ b/indra/newview/fsconsoleutils.cpp @@ -31,7 +31,6 @@ #include "fscommon.h" #include "fsfloaternearbychat.h" -#include "lggcontactsets.h" #include "llagent.h" #include "llavatarnamecache.h" #include "llconsole.h" diff --git a/indra/newview/fscontactsfriendsmenu.cpp b/indra/newview/fscontactsfriendsmenu.cpp index c78a61d3d2..06cac87333 100644 --- a/indra/newview/fscontactsfriendsmenu.cpp +++ b/indra/newview/fscontactsfriendsmenu.cpp @@ -34,7 +34,6 @@ #include "lllogchat.h" #include "llmenugl.h" #include "llslurl.h" -#include "lluictrlfactory.h" #include "llurlaction.h" #include "llviewercontrol.h"