summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.cpp
diff options
context:
space:
mode:
authorBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
committerBaker Linden <baker@lindenlab.com>2014-05-08 14:00:55 -0700
commit37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch)
tree3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/newview/llpanelavatar.cpp
parent1cf659d4481983684c4d5d749d95d56832dbc621 (diff)
parentd0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff)
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rwxr-xr-xindra/newview/llpanelavatar.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 679b1bdcda..5d1b582d1f 100755
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -29,7 +29,6 @@
#include "llagent.h"
#include "llavataractions.h"
-#include "llavatarconstants.h" // AVATAR_ONLINE
#include "llcallingcard.h"
#include "llcombobox.h"
#include "lldateutil.h" // ageFromDate()
@@ -98,7 +97,7 @@ LLDropTarget::~LLDropTarget()
void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
{
- llinfos << "LLDropTarget::doDrop()" << llendl;
+ LL_INFOS() << "LLDropTarget::doDrop()" << LL_ENDL;
}
BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,