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

More cleaning up and fixing funky variable redefinitions

master
Ansariel 2015-05-09 13:11:01 +02:00
parent 67fceb3ef8
commit 28ae84f967
8 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/ao.cpp
View File

@ -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())
{

30
indra/newview/aoengine.cpp
View File

@ -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<LLInventoryCategory> cat = (*it);
std::vector<std::string> 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<std::string> params;
LLStringUtil::getTokens(stateCategories->at(state_index)->getName(), params, ":");
std::string stateName = params[0];
std::vector<std::string> 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;
}
}

15
indra/newview/chatbar_as_cmdline.cpp
View File

@ -45,7 +45,6 @@
#include "fsfloaternearbychat.h"
// </FS:Ansariel> [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.");
}

5
indra/newview/fsareasearch.cpp
View File

@ -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);

2
indra/newview/fsavatarsearchmenu.cpp
View File

@ -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"

1
indra/newview/fscommon.cpp
View File

@ -37,7 +37,6 @@
#include "lllogchat.h"
#include "llmutelist.h"
#include "llnotificationmanager.h"
#include "llnotificationsutil.h" // <FS:CR> reportToNearbyChat
#include "lltooldraganddrop.h"
#include "llviewerinventory.h"
#include "llviewernetwork.h"

1
indra/newview/fsconsoleutils.cpp
View File

@ -31,7 +31,6 @@
#include "fscommon.h"
#include "fsfloaternearbychat.h"
#include "lggcontactsets.h"
#include "llagent.h"
#include "llavatarnamecache.h"
#include "llconsole.h"

1
indra/newview/fscontactsfriendsmenu.cpp
View File

@ -34,7 +34,6 @@
#include "lllogchat.h"
#include "llmenugl.h"
#include "llslurl.h"
#include "lluictrlfactory.h"
#include "llurlaction.h"
#include "llviewercontrol.h"