summaryrefslogtreecommitdiff
path: root/indra/newview/llavatarpropertiesprocessor.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2014-04-07 19:09:40 -0700
committerRichard Linden <none@none>2014-04-07 19:09:40 -0700
commit98aabdc176c23de9ba23f902dc2015f9c775d26e (patch)
tree5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/newview/llavatarpropertiesprocessor.cpp
parent7e966f28da79d2d24f93a2615c8807421300700c (diff)
parente5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff)
merge with release
Diffstat (limited to 'indra/newview/llavatarpropertiesprocessor.cpp')
-rwxr-xr-xindra/newview/llavatarpropertiesprocessor.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
index 706bc42ea0..856eb3414e 100755
--- a/indra/newview/llavatarpropertiesprocessor.cpp
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -36,7 +36,6 @@
#include "llstartup.h"
// Linden library includes
-#include "llavatarconstants.h" // AVATAR_TRANSACTED, etc.
#include "lldate.h"
#include "lltrans.h"
#include "llui.h" // LLUI::getLanguage()
@@ -171,11 +170,11 @@ void LLAvatarPropertiesProcessor::sendAvatarPropertiesUpdate(const LLAvatarData*
{
if (!gAgent.isInitialized() || (gAgent.getID() == LLUUID::null))
{
- llwarns << "Sending avatarinfo update DENIED - invalid agent" << llendl;
+ LL_WARNS() << "Sending avatarinfo update DENIED - invalid agent" << LL_ENDL;
return;
}
- llinfos << "Sending avatarinfo update" << llendl;
+ LL_INFOS() << "Sending avatarinfo update" << LL_ENDL;
// This value is required by sendAvatarPropertiesUpdate method.
//A profile should never be mature. (From the original code)