Small round of clean up:

* Remove unused includes
* Fix a case of improper declared method
* Fixed a few cases of variable redefintions

indra/newview/fsfloaterimport.cpp

@@ -30,7 +30,6 @@
 #include "fsfloaterimport.h"
 
 #include "llagent.h"
-#include "llagentcamera.h"
 #include "llappviewer.h"
 #include "llbuycurrencyhtml.h"
 #include "llcallbacklist.h"
@@ -38,13 +37,9 @@
 #include "lldatapacker.h"
 #include "lldir.h"
 #include "lleconomy.h"
-#include "llfilepicker.h"
 #include "llfloaterperms.h"
-#include "llfloaterreg.h"
 #include "llinventorydefines.h"
 #include "llinventoryfunctions.h"
-#include "lllineeditor.h"
-#include "llmaterialmgr.h"
 #include "llmultigesture.h"
 #include "llnotificationsutil.h"
 #include "llparcel.h"
@@ -65,10 +60,8 @@
 #include "llvfile.h"
 #include "llvfs.h"
 #include "llvolumemessage.h"
-#include "llviewerstats.h"
 #include "lltrace.h"
 #include "fsexportperms.h"
-#include "material_codes.h"
 #include <boost/algorithm/string_regex.hpp>
 #include <boost/lexical_cast.hpp>
 

indra/newview/fspanelcontactsets.cpp

@@ -40,7 +40,6 @@
 #include "llfloaterreg.h"
 #include "llpanelpeoplemenus.h"
 #include "llslurl.h"
-#include "lltrans.h"
 
 #include <boost/foreach.hpp>
 

indra/newview/fspanelprefs.cpp

@@ -34,17 +34,13 @@
 #include "lggbeammaps.h"
 #include "llagent.h"
 #include "llcheckboxctrl.h"
-#include "llcolorswatch.h"
 #include "llcombobox.h"
 #include "lldiriterator.h"	// <FS:CR> for populating the cloud combo
 #include "llfloaterreg.h"
 #include "llinventorymodel.h"
-#include "llspinctrl.h"
 #include "llstartup.h"
 #include "lltexturectrl.h"
 #include "llviewercontrol.h"
-#include "llvoavatar.h"
-#include "llvoavatarself.h"
 
 static LLPanelInjector<FSPanelPrefs> t_pref_fs("panel_preference_firestorm");
 

indra/newview/fspanelprofile.cpp

@@ -60,7 +60,6 @@
 #include "llfloaterreg.h"
 #include "llfirstuse.h"
 #include "llnotificationsutil.h"
-#include "llnotificationsutil.h"
 #include "lltrans.h"
 #include "llvoiceclient.h"
 #include "llgroupactions.h"
@@ -70,7 +69,6 @@
 #include "llparcel.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
-#include "llworldmap.h"
 
 static LLPanelInjector<FSPanelProfileSecondLife> t_panel_profile_secondlife("panel_profile_secondlife");
 static LLPanelInjector<FSPanelProfileWeb> t_panel_web("panel_profile_web");

indra/newview/fspanelprofile.h

@@ -61,7 +61,7 @@ public:
 	/**
 	 * Sets avatar ID, sets panel as observer of avatar related info replies from server.
 	 */
-	void setAvatarId(const LLUUID& id);
+	virtual void setAvatarId(const LLUUID& id);
 
 	/**
 	 * Processes data received from server.

indra/newview/fspanelprofileclassifieds.cpp

@@ -29,21 +29,15 @@
 #include "fspanelprofileclassifieds.h"
 
 #include "llagent.h"
-#include "llagentpicksinfo.h"
-//#include "llavatarconstants.h"
 #include "llflatlistview.h"
 #include "llfloaterreg.h"
 #include "llfloaterworldmap.h"
 #include "llnotificationsutil.h"
-#include "lltexturectrl.h"
 #include "lltrans.h"
-#include "llviewergenericmessage.h"	// send_generic_message
 #include "llmenugl.h"
 #include "llviewermenu.h"
 #include "llregistry.h"
 
-#include "llaccordionctrl.h"
-#include "llaccordionctrltab.h"
 #include "llavatarpropertiesprocessor.h"
 #include "fspanelprofile.h"
 #include "fspanelclassified.h"

indra/newview/fspanelradar.cpp

@@ -30,10 +30,7 @@
 
 // libs
 #include "llfiltereditor.h"
-#include "llfloaterreg.h"
-#include "lllayoutstack.h"
 #include "llmenugl.h"
-#include "llnotificationsutil.h"
 #include "lluictrlfactory.h"
 #include "llmenubutton.h"
 #include "lltoggleablemenu.h"
@@ -41,7 +38,6 @@
 // newview
 #include "fsradarmenu.h"
 #include "llavataractions.h"
-#include "llfloatersidepanelcontainer.h"
 #include "llnetmap.h"
 #include "llpanelblockedlist.h"
 #include "llviewercontrol.h"		// for gSavedSettings

indra/newview/fsradar.cpp

@@ -45,8 +45,6 @@
 #include "lfsimfeaturehandler.h"
 #include "llagent.h"
 #include "llavataractions.h"
-//#include "llavatarconstants.h"		// for range constants
-#include "llgroupactions.h"
 #include "llmutelist.h"
 #include "llnotificationmanager.h"
 #include "lltracker.h"
@@ -62,12 +60,12 @@
 
 using namespace boost;
 
-#define FS_RADAR_LIST_UPDATE_INTERVAL 1
+static const F32 FS_RADAR_LIST_UPDATE_INTERVAL = 1.f;
 
 /**
  * Periodically updates the nearby people list while the Nearby tab is active.
  * 
- * The period is defined by FS_NEARBY_LIST_UPDATE_INTERVAL constant.
+ * The period is defined by FS_RADAR_LIST_UPDATE_INTERVAL constant.
  */
 class FSRadarListUpdater : public FSRadar::Updater, public LLEventTimer
 {
@@ -147,11 +145,10 @@ void FSRadar::radarAlertMsg(const LLUUID& agent_id, const LLAvatarName& av_name,
 		LLSD args;
 		args["NAME"] = FSRadarEntry::getRadarName(av_name);
 		args["MESSAGE"] = postMsg;
-		LLNotificationPtr notification;
-		notification = LLNotificationsUtil::add("RadarAlert",
-												args,
-												payload.with("respond_on_mousedown", TRUE),
-												boost::bind(&LLAvatarActions::zoomIn, agent_id));
+		LLNotificationsUtil::add("RadarAlert",
+									args,
+									payload.with("respond_on_mousedown", TRUE),
+									boost::bind(&LLAvatarActions::zoomIn, agent_id));
 	}
 	else
 	{

indra/newview/fswsassetblacklist.cpp

@@ -201,19 +201,19 @@ void FSWSAssetBlacklist::loadBlacklist()
 					LLUUID uid = LLUUID(itr->first);
 					LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
 					cipher.decrypt(uid.mData, UUID_BYTES);
-					LLSD data = itr->second;
+					LLSD entry_data = itr->second;
 					if (uid.isNull())
 					{
 						continue;
 					}
 
-					LLAssetType::EType type = S32toAssetType(data["asset_type"].asInteger());
+					LLAssetType::EType type = S32toAssetType(entry_data["asset_type"].asInteger());
 					if (type == LLAssetType::AT_NONE)
 					{
 						continue;
 					}
 					
-					addNewItemToBlacklistData(uid, data, false);
+					addNewItemToBlacklistData(uid, entry_data, false);
 				}
 			}
 		}

indra/newview/growlmanager.cpp

@@ -340,7 +340,7 @@ void GrowlManager::onScriptDialog(const LLSD& data)
 {
 	LLNotificationPtr notification = LLNotifications::instance().find(data["notification_id"].asUUID());
 	const std::string name = notification->getName();
-	LLSD payload = notification->getPayload();
+	//LLSD payload = notification->getPayload();
 	LLSD substitutions = notification->getSubstitutions();
 
 	//LL_INFOS("GrowlLLNotification") << "Script dialog: name=" << name << " - payload=" << payload << " subs=" << substitutions << LL_ENDL;

indra/newview/kcwlinterface.cpp

@@ -70,11 +70,10 @@ void KCWindlightInterface::ParcelChange()
 	
 	mDisabled = false;
 
-	LLParcel *parcel = NULL;
 	S32 this_parcel_id = 0;
 	std::string desc;
 
- 	parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
 	// Since we cannot depend on the order in which the EnvironmentSettings cap and parcel info
 	// will come in, we must check if the other has set something before this one for the current region.
@@ -141,15 +140,14 @@ BOOL KCWindlightInterface::tick()
 		return FALSE;
 	}
 
-	LLParcel *parcel = NULL;
-
-	parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 
 	if (parcel)
 	{
-		LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 		if (!LoadFromParcel(parcel) || !mCurrentSettings.has("sky"))
+		{
 			mEventTimer.stop();
+		}
 	}
 
 	return FALSE;
@@ -366,7 +364,7 @@ bool KCWindlightInterface::ParseParcelForWLSettings(const std::string& desc, LLS
 		const boost::regex Parcel_exp("(?i)\\/\\*(?:Windlight)?([\\s\\S]*?)\\*\\/");
 		if(boost::regex_search(desc, mat_block, Parcel_exp))
 		{
-			std::string data1(mat_block[1].first, mat_block[1].second);
+			//std::string data1(mat_block[1].first, mat_block[1].second);
 			//LL_INFOS() << "found parcel flags block: " << mat_block[1] << LL_ENDL;
 			
 			S32 sky_index = 0;
@@ -376,8 +374,8 @@ bool KCWindlightInterface::ParseParcelForWLSettings(const std::string& desc, LLS
 			std::string::const_iterator start = mat_block[1].first;
 			std::string::const_iterator end = mat_block[1].second;
 			//Sky: "preset" Water: "preset"
-			const boost::regex key("(?i)(?:(?:(Sky)(?:\\s?@\\s?([\\d]+)m?\\s?(?:to|-)\\s?([\\d]+)m?)?)|(Water))\\s?:\\s?\"([^\"\\r\\n]+)\"|(RegionOverride)");
-			while (boost::regex_search(start, end, match, key, boost::match_default))
+			const boost::regex key_regex("(?i)(?:(?:(Sky)(?:\\s?@\\s?([\\d]+)m?\\s?(?:to|-)\\s?([\\d]+)m?)?)|(Water))\\s?:\\s?\"([^\"\\r\\n]+)\"|(RegionOverride)");
+			while (boost::regex_search(start, end, match, key_regex, boost::match_default))
 			{
 				if (match[1].matched)
 				{
@@ -422,7 +420,7 @@ bool KCWindlightInterface::ParseParcelForWLSettings(const std::string& desc, LLS
 				}
 				else if (match[6].matched)
 				{
-					std::string preset(match[5]);
+					//std::string preset(match[5]);
 					LL_INFOS() << "got region override flag" << LL_ENDL;
 					settings["region_override"] = true;
 				}
@@ -452,8 +450,7 @@ void KCWindlightInterface::onClickWLStatusButton()
 
 	if (mWLset)
 	{
-		LLParcel *parcel = NULL;
- 		parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+ 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
  		if (parcel)
 		{
 			//TODO: this could be better

indra/newview/lfsimfeaturehandler.cpp

@@ -20,7 +20,6 @@
 #include "lfsimfeaturehandler.h"
 
 #include "llagent.h"
-#include "llenvmanager.h"
 #include "llviewernetwork.h"
 #include "llviewerregion.h"
 

indra/newview/llagent.cpp

@@ -108,8 +108,6 @@
 #include "rlvactions.h"
 #include "rlvhandler.h"
 #include "rlvhelper.h"
-#include "rlvui.h"
-#include "utilitybar.h"
 #include "NACLantispam.h"
 
 using namespace LLAvatarAppearanceDefines;