From f0986b43d9ce58b6be2dc4c92b1e0d9e7b2537e4 Mon Sep 17 00:00:00 2001 From: Cinders Date: Wed, 30 Jan 2013 20:09:55 -0700 Subject: [PATCH] More trivial EOL fixes --- indra/newview/fsfloaterblocklist.cpp | 2 +- indra/newview/fsfloaterblocklist.h | 2 +- indra/newview/fsfloatergroup.cpp | 2 +- indra/newview/fsfloaterplacedetails.h | 2 +- indra/newview/fsfloaterteleporthistory.cpp | 2 +- indra/newview/fsfloaterteleporthistory.h | 2 +- indra/newview/fsgrouptitles.cpp | 2 +- indra/newview/fsmoneytracker.cpp | 2 +- indra/newview/fsnearbychatvoicemonitor.h | 2 +- indra/newview/fsslurlcommand.h | 2 +- indra/newview/fswsassetblacklist.cpp | 2 +- indra/newview/llchicletbar.cpp | 2 +- indra/newview/llfloaterbuildoptions.cpp | 2 +- indra/newview/llfloaterbuildoptions.h | 2 +- indra/newview/llimfloater.cpp | 4 ++-- indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp | 2 +- indra/newview/llmutelist.cpp | 2 +- indra/newview/llpanelopenregionsettings.cpp | 2 +- indra/newview/pieslice.cpp | 2 +- indra/newview/utilitybar.cpp | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/indra/newview/fsfloaterblocklist.cpp b/indra/newview/fsfloaterblocklist.cpp index 4852733571..9f995511b8 100644 --- a/indra/newview/fsfloaterblocklist.cpp +++ b/indra/newview/fsfloaterblocklist.cpp @@ -56,4 +56,4 @@ void FSFloaterBlocklist::onOpen(const LLSD& key) { mBlockedListPanel->onOpen(key); } -} \ No newline at end of file +} diff --git a/indra/newview/fsfloaterblocklist.h b/indra/newview/fsfloaterblocklist.h index 1439c53d67..291f529c86 100644 --- a/indra/newview/fsfloaterblocklist.h +++ b/indra/newview/fsfloaterblocklist.h @@ -41,4 +41,4 @@ private: LLPanel* mBlockedListPanel; }; -#endif // FS_FLOATERBLOCKLIST_H \ No newline at end of file +#endif // FS_FLOATERBLOCKLIST_H diff --git a/indra/newview/fsfloatergroup.cpp b/indra/newview/fsfloatergroup.cpp index dc6e50c549..ab16312b5d 100644 --- a/indra/newview/fsfloatergroup.cpp +++ b/indra/newview/fsfloatergroup.cpp @@ -145,4 +145,4 @@ FSFloaterGroup* FSFloaterGroup::getInstance(const LLUUID& group_id) FSFloaterGroup* FSFloaterGroup::findInstance(const LLUUID& group_id) { return LLFloaterReg::findTypedInstance("fs_group", LLSD().with("group_id", group_id)); -} \ No newline at end of file +} diff --git a/indra/newview/fsfloaterplacedetails.h b/indra/newview/fsfloaterplacedetails.h index ca820cd061..e574f5e1ba 100644 --- a/indra/newview/fsfloaterplacedetails.h +++ b/indra/newview/fsfloaterplacedetails.h @@ -107,4 +107,4 @@ private: boost::signals2::connection mAgentParcelChangedConnection; }; -#endif // FS_FLOATERPLACEDETAILS_H \ No newline at end of file +#endif // FS_FLOATERPLACEDETAILS_H diff --git a/indra/newview/fsfloaterteleporthistory.cpp b/indra/newview/fsfloaterteleporthistory.cpp index ac0df61173..1dc8d087fa 100644 --- a/indra/newview/fsfloaterteleporthistory.cpp +++ b/indra/newview/fsfloaterteleporthistory.cpp @@ -93,4 +93,4 @@ void FSFloaterTeleportHistory::onFilterEdit(const std::string& search_string, bo mHistoryPanel->onSearchEdit(string); } -} \ No newline at end of file +} diff --git a/indra/newview/fsfloaterteleporthistory.h b/indra/newview/fsfloaterteleporthistory.h index 725d76258c..540339efda 100644 --- a/indra/newview/fsfloaterteleporthistory.h +++ b/indra/newview/fsfloaterteleporthistory.h @@ -44,4 +44,4 @@ private: LLFilterEditor* mFilterEditor; }; -#endif // FS_FLOATERTELEPORTHISTORY_H \ No newline at end of file +#endif // FS_FLOATERTELEPORTHISTORY_H diff --git a/indra/newview/fsgrouptitles.cpp b/indra/newview/fsgrouptitles.cpp index 13f7285229..72484fb57b 100644 --- a/indra/newview/fsgrouptitles.cpp +++ b/indra/newview/fsgrouptitles.cpp @@ -276,4 +276,4 @@ void FSGroupTitles::openGroupInfo() LLUUID group_id = selected_item->getColumn(mTitleList->getColumn("group_id")->mIndex)->getValue().asUUID(); LLGroupActions::show(group_id); } -} \ No newline at end of file +} diff --git a/indra/newview/fsmoneytracker.cpp b/indra/newview/fsmoneytracker.cpp index c5b584e849..0809da7fec 100644 --- a/indra/newview/fsmoneytracker.cpp +++ b/indra/newview/fsmoneytracker.cpp @@ -92,4 +92,4 @@ void FSMoneyTracker::clear() { llinfos << "Cleared." << llendl; mTransactionHistory->clear(); -} \ No newline at end of file +} diff --git a/indra/newview/fsnearbychatvoicemonitor.h b/indra/newview/fsnearbychatvoicemonitor.h index e029728aae..36adfb7876 100644 --- a/indra/newview/fsnearbychatvoicemonitor.h +++ b/indra/newview/fsnearbychatvoicemonitor.h @@ -54,4 +54,4 @@ protected: bool mVoiceMonitorVisible; }; -#endif // FS_NEARBYCHATVOICEMONITOR \ No newline at end of file +#endif // FS_NEARBYCHATVOICEMONITOR diff --git a/indra/newview/fsslurlcommand.h b/indra/newview/fsslurlcommand.h index 77aed6ed1d..a796cee6d9 100644 --- a/indra/newview/fsslurlcommand.h +++ b/indra/newview/fsslurlcommand.h @@ -25,4 +25,4 @@ #include "llviewerprecompiledheaders.h" -#endif \ No newline at end of file +#endif diff --git a/indra/newview/fswsassetblacklist.cpp b/indra/newview/fswsassetblacklist.cpp index ed1ed8cdd8..b0a8292044 100644 --- a/indra/newview/fswsassetblacklist.cpp +++ b/indra/newview/fswsassetblacklist.cpp @@ -263,4 +263,4 @@ void FSWSAssetBlacklist::saveBlacklist() LLSDSerialize::toPrettyXML(savedata, save_file); save_file.close(); -} \ No newline at end of file +} diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 6c3743d776..253bf8b1d2 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -354,4 +354,4 @@ void LLChicletBar::updateVisibility(const LLSD &data) { mChicletPanel->setVisible(!data.asBoolean()); } -// \ No newline at end of file +// diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp index 1a0a8a437d..99a41bb6f7 100644 --- a/indra/newview/llfloaterbuildoptions.cpp +++ b/indra/newview/llfloaterbuildoptions.cpp @@ -44,4 +44,4 @@ LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key) LLFloaterBuildOptions::~LLFloaterBuildOptions() { -} \ No newline at end of file +} diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h index 632ed1cc76..164944d7bc 100644 --- a/indra/newview/llfloaterbuildoptions.h +++ b/indra/newview/llfloaterbuildoptions.h @@ -44,4 +44,4 @@ private: ~LLFloaterBuildOptions(); }; -#endif \ No newline at end of file +#endif diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 457f1f3dea..493454f6f7 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -1141,7 +1141,7 @@ bool LLIMFloater::toggle(const LLUUID& session_id) floater->setVisible(false); return false; } - else if(floater && (!floater->isDocked() || floater->getVisible() && !floater->hasFocus())) + else if(floater && (!floater->isDocked() || (floater->getVisible() && !floater->hasFocus()))) { floater->setVisible(TRUE); floater->setFocus(TRUE); @@ -1821,4 +1821,4 @@ void LLIMFloater::setEnableAddFriendButton(BOOL enabled) { getChild("add_friend_btn")->setEnabled(enabled); } -// \ No newline at end of file +// diff --git a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp index b79dec1a59..08d215402a 100644 --- a/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp +++ b/indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp @@ -260,4 +260,4 @@ void LLMenuOptionPathfindingRebakeNavmesh::rebakeNavmesh() { sendRequestRebakeNavmesh(); } -// \ No newline at end of file +// diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index ac0971ed96..759af95804 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -794,4 +794,4 @@ LLMute LLMuteList::getMute(const LLUUID& id) return LLMute(LLUUID::null); } } -// \ No newline at end of file +// diff --git a/indra/newview/llpanelopenregionsettings.cpp b/indra/newview/llpanelopenregionsettings.cpp index 259dad7a1f..d6689e1ce6 100644 --- a/indra/newview/llpanelopenregionsettings.cpp +++ b/indra/newview/llpanelopenregionsettings.cpp @@ -205,4 +205,4 @@ class OpenRegionInfoUpdate : public LLHTTPNode LLHTTPRegistration gHTTPRegistrationOpenRegionInfoUpdate( - "/message/OpenRegionInfo"); \ No newline at end of file + "/message/OpenRegionInfo"); diff --git a/indra/newview/pieslice.cpp b/indra/newview/pieslice.cpp index 54b7ec2497..9f5bc056ba 100644 --- a/indra/newview/pieslice.cpp +++ b/indra/newview/pieslice.cpp @@ -156,4 +156,4 @@ BOOL PieSlice::getAutohide() void PieSlice::resetUpdateEnabledCheck() { mDoUpdateEnabled = TRUE; -} \ No newline at end of file +} diff --git a/indra/newview/utilitybar.cpp b/indra/newview/utilitybar.cpp index d6e887be02..a6fc261cbb 100644 --- a/indra/newview/utilitybar.cpp +++ b/indra/newview/utilitybar.cpp @@ -137,4 +137,4 @@ void UtilityBar::setAOInterfaceButtonExpanded(bool expanded) mAOInterfaceButton->setImageOverlay("arrow_up.tga"); } } -} \ No newline at end of file +}