diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
| commit | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (patch) | |
| tree | b5ac3f23c9fbd7dba299cd7aa2e8e4f812df98f6 /indra/newview/llavatarpropertiesprocessor.cpp | |
| parent | 1953c569a6acfd731af2c459da7a6928be4aaf5b (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with viewer-release
Diffstat (limited to 'indra/newview/llavatarpropertiesprocessor.cpp')
| -rwxr-xr-x | indra/newview/llavatarpropertiesprocessor.cpp | 5 |
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) |