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

fixed mixed line endings in a few header files

meow-7.2.2
Tank_Master 2011-01-20 00:55:17 -08:00
parent 29597ee6d6
commit 5e1f13d169
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
indra/newview/llpanelprofileview.h
View File

@ -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<LLPanel>("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<LLPanel>("panel_profile_view");
if(panel)
panel->onOpen(key);
}
};
// [/SL:KB]
#endif //LL_LLPANELPROFILEVIEW_H

2
indra/newview/rlvfloaters.h
View File

@ -98,4 +98,4 @@ protected:
// ============================================================================
#endif // RLV_FLOATERS_H
#endif // RLV_FLOATERS_H