diff options
author | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-08-12 20:07:41 -0700 |
commit | b8d49dab9afddf196618d66b1a409cdf7d2d53ba (patch) | |
tree | 535eb32ba4f17c87c0853cda9223c37a4940fea1 /indra/newview/llfloateravatarpicker.cpp | |
parent | c2601ec9c574ac3bd7a7f4001bc08572483028a6 (diff) | |
parent | 1a093beb7f69e6911f34cb12d71502aa7a05982e (diff) |
merge
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rwxr-xr-x | indra/newview/llfloateravatarpicker.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 76773f914d..8d5352e2a6 100755 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -70,7 +70,7 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(select_callback_t callback, LLFloaterReg::showTypedInstance<LLFloaterAvatarPicker>("avatar_picker", LLSD(name)); if (!floater) { - llwarns << "Cannot instantiate avatar picker" << llendl; + LL_WARNS() << "Cannot instantiate avatar picker" << LL_ENDL; return NULL; } @@ -468,7 +468,7 @@ public: { //std::ostringstream ss; //LLSDSerialize::toPrettyXML(content, ss); - //llinfos << ss.str() << llendl; + //LL_INFOS() << ss.str() << LL_ENDL; // in case of invalid characters, the avatar picker returns a 400 // just set it to process so it displays 'not found' @@ -483,7 +483,7 @@ public: } else { - llwarns << "avatar picker failed [status:" << status << "]: " << content << llendl; + LL_WARNS() << "avatar picker failed [status:" << status << "]: " << content << LL_ENDL; } } @@ -514,7 +514,7 @@ void LLFloaterAvatarPicker::find() } url += "?page_size=100&names="; url += LLURI::escape(text); - llinfos << "avatar picker " << url << llendl; + LL_INFOS() << "avatar picker " << url << LL_ENDL; LLHTTPClient::get(url, new LLAvatarPickerResponder(mQueryID, getKey().asString())); } else |