From 5e1f13d169cb3bbcf2c91c312e1e98d7aa1bccbf Mon Sep 17 00:00:00 2001 From: Tank_Master Date: Thu, 20 Jan 2011 00:55:17 -0800 Subject: [PATCH] fixed mixed line endings in a few header files --- indra/newview/llpanelprofileview.h | 44 +++++++++++++++--------------- indra/newview/rlvfloaters.h | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/indra/newview/llpanelprofileview.h b/indra/newview/llpanelprofileview.h index 9a7ed73aab..2bd249728a 100644 --- a/indra/newview/llpanelprofileview.h +++ b/indra/newview/llpanelprofileview.h @@ -32,8 +32,8 @@ #include "llavatarpropertiesprocessor.h" #include "llagent.h" #include "lltooldraganddrop.h" -// [SL:KB] - Patch : UI-ProfileGroupFloater | Checked: 2010-09-08 (Catznip-2.1.2c) | Added: Catznip-2.1.2c -#include "llfloater.h" +// [SL:KB] - Patch : UI-ProfileGroupFloater | Checked: 2010-09-08 (Catznip-2.1.2c) | Added: Catznip-2.1.2c +#include "llfloater.h" // [/SL:KB] class LLAvatarName; @@ -67,11 +67,11 @@ public: void *cargo_data, EAcceptance *accept, std::string& tooltip_msg) { -// LLToolDragAndDrop::handleGiveDragAndDrop(getAvatarId(), gAgent.getSessionID(), drop, -// cargo_type, cargo_data, accept); -// [SL:KB] - Patch : UI-ProfileGroupFloater - LLToolDragAndDrop::handleGiveDragAndDrop(getAvatarId(), LLUUID::null, drop, cargo_type, cargo_data, accept); -// [/SL:KB] +// LLToolDragAndDrop::handleGiveDragAndDrop(getAvatarId(), gAgent.getSessionID(), drop, +// cargo_type, cargo_data, accept); +// [SL:KB] - Patch : UI-ProfileGroupFloater + LLToolDragAndDrop::handleGiveDragAndDrop(getAvatarId(), LLUUID::null, drop, cargo_type, cargo_data, accept); +// [/SL:KB] return TRUE; } @@ -111,20 +111,20 @@ private: AvatarStatusObserver* mAvatarStatusObserver; }; -// [SL:KB] - Patch : UI-ProfileGroupFloater -class LLFloaterProfileView : public LLFloater -{ -public: - LLFloaterProfileView(const LLSD& seed) : LLFloater(seed) {} - ~LLFloaterProfileView() {} - - void onOpen(const LLSD& key) - { - LLPanel* panel = findChild("panel_profile_view"); - if(panel) - panel->onOpen(key); - } - -}; +// [SL:KB] - Patch : UI-ProfileGroupFloater +class LLFloaterProfileView : public LLFloater +{ +public: + LLFloaterProfileView(const LLSD& seed) : LLFloater(seed) {} + ~LLFloaterProfileView() {} + + void onOpen(const LLSD& key) + { + LLPanel* panel = findChild("panel_profile_view"); + if(panel) + panel->onOpen(key); + } + +}; // [/SL:KB] #endif //LL_LLPANELPROFILEVIEW_H diff --git a/indra/newview/rlvfloaters.h b/indra/newview/rlvfloaters.h index 9e3cb88e54..f65732ba93 100644 --- a/indra/newview/rlvfloaters.h +++ b/indra/newview/rlvfloaters.h @@ -98,4 +98,4 @@ protected: // ============================================================================ -#endif // RLV_FLOATERS_H \ No newline at end of file +#endif // RLV_FLOATERS_H