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

Replaced more deprecated logging macros in FS classes

Ansariel 2014-05-12 19:10:53 +02:00
parent 93b8ce8182
commit abe41419aa
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/fsfloaternearbychat.cpp
View File

@ -1133,22 +1133,22 @@ void FSFloaterNearbyChat::sendChatFromViewer(const LLWString &wtext, EChatType t
{
if (type == CHAT_TYPE_WHISPER)
{
lldebugs << "You whisper " << utf8_text << llendl;
LL_DEBUGS("FSFloaterNearbyChat") << "You whisper " << utf8_text << LL_ENDL;
gAgent.sendAnimationRequest(ANIM_AGENT_WHISPER, ANIM_REQUEST_START);
}
else if (type == CHAT_TYPE_NORMAL)
{
lldebugs << "You say " << utf8_text << llendl;
LL_DEBUGS("FSFloaterNearbyChat") << "You say " << utf8_text << LL_ENDL;
gAgent.sendAnimationRequest(ANIM_AGENT_TALK, ANIM_REQUEST_START);
}
else if (type == CHAT_TYPE_SHOUT)
{
lldebugs << "You shout " << utf8_text << llendl;
LL_DEBUGS("FSFloaterNearbyChat") << "You shout " << utf8_text << LL_ENDL;
gAgent.sendAnimationRequest(ANIM_AGENT_SHOUT, ANIM_REQUEST_START);
}
else
{
llinfos << "send_chat_from_viewer() - invalid volume" << llendl;
LL_INFOS("FSFloaterNearbyChat") << "send_chat_from_viewer() - invalid volume" << LL_ENDL;
return;
}
}
@ -1156,7 +1156,7 @@ void FSFloaterNearbyChat::sendChatFromViewer(const LLWString &wtext, EChatType t
{
if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
{
lldebugs << "Channel chat: " << utf8_text << llendl;
LL_DEBUGS("FSFloaterNearbyChat") << "Channel chat: " << utf8_text << LL_ENDL;
}
}

2
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -758,7 +758,7 @@ void FSFloaterVoiceControls::setState(LLAvatarListItem* item, ESpeakerState stat
}
break;
default:
llwarns << "Unrecognized avatar panel state (" << state << ")" << llendl;
LL_WARNS("Voice") << "Unrecognized avatar panel state (" << state << ")" << LL_ENDL;
break;
}
}

2
indra/newview/fsnearbychathub.cpp
View File

@ -323,7 +323,7 @@ void FSNearbyChat::sendChatFromViewer(const LLWString& wtext, EChatType type, BO
{
if (type != CHAT_TYPE_START && type != CHAT_TYPE_STOP)
{
lldebugs << "Channel chat: " << utf8_text << llendl;
LL_DEBUGS("FSNearbyChatHub") << "Channel chat: " << utf8_text << LL_ENDL;
}
}

26
indra/newview/fspanelclassified.cpp
View File

@ -106,8 +106,8 @@ public:
const std::string& reason,
const LLSD& content)
{
llwarns << "Sending click message failed (" << status << "): [" << reason << "]" << llendl;
llwarns << "Content: [" << content << "]" << llendl;
LL_WARNS("FSClassifiedClickMessageResponder") << "Sending click message failed (" << status << "): [" << reason << "]" << LL_ENDL;
LL_WARNS("FSClassifiedClickMessageResponder") << "Content: [" << content << "]" << LL_ENDL;
}
};
@ -229,7 +229,7 @@ void FSPanelClassifiedInfo::onOpen(const LLSD& key)
setSnapshotId(key["classified_snapshot_id"]);
setFromSearch(key["from_search"]);
llinfos << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << llendl;
LL_INFOS("FSPanelClassifiedInfo") << "Opening classified [" << getClassifiedName() << "] (" << getClassifiedId() << ")" << LL_ENDL;
LLAvatarPropertiesProcessor::getInstance()->addObserver(getAvatarId(), this);
// LLAvatarPropertiesProcessor::getInstance()->sendClassifiedInfoRequest(getClassifiedId());
@ -241,7 +241,7 @@ void FSPanelClassifiedInfo::onOpen(const LLSD& key)
std::string url = gAgent.getRegion()->getCapability("SearchStatRequest");
if (!url.empty())
{
llinfos << "Classified stat request via capability" << llendl;
LL_INFOS("FSPanelClassifiedInfo") << "Classified stat request via capability" << LL_ENDL;
LLSD body;
body["classified_id"] = getClassifiedId();
LLHTTPClient::post(url, body, new LLClassifiedStatsResponder(getClassifiedId()));
@ -404,9 +404,9 @@ void FSPanelClassifiedInfo::setClickThrough(
S32 profile,
bool from_new_table)
{
llinfos << "Click-through data for classified " << classified_id << " arrived: ["
LL_INFOS("FSPanelClassifiedInfo") << "Click-through data for classified " << classified_id << " arrived: ["
<< teleport << ", " << map << ", " << profile << "] ("
<< (from_new_table ? "new" : "old") << ")" << llendl;
<< (from_new_table ? "new" : "old") << ")" << LL_ENDL;
for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
{
@ -423,7 +423,7 @@ void FSPanelClassifiedInfo::setClickThrough(
continue;
}
llinfos << "Updating classified info panel" << llendl;
LL_INFOS("FSPanelClassifiedInfo") << "Updating classified info panel" << LL_ENDL;
// We need to check to see if the data came from the new stat_table
// or the old classified table. We also need to cache the data from
@ -452,10 +452,10 @@ void FSPanelClassifiedInfo::setClickThrough(
// *HACK: remove this when there is enough room for click stats in the info panel
self->getChildView("click_through_text")->setToolTip(ct_str.getString());
llinfos << "teleport: " << llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld)
<< ", map: " << llformat("%d", self->mMapClicksNew + self->mMapClicksOld)
<< ", profile: " << llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld)
<< llendl;
LL_INFOS("FSPanelClassifiedInfo") << "teleport: " << llformat("%d", self->mTeleportClicksNew + self->mTeleportClicksOld)
<< ", map: " << llformat("%d", self->mMapClicksNew + self->mMapClicksOld)
<< ", profile: " << llformat("%d", self->mProfileClicksNew + self->mProfileClicksOld)
<< LL_ENDL;
}
}
@ -565,8 +565,8 @@ void FSPanelClassifiedInfo::sendClickMessage(
body["region_name"] = sim_name;
std::string url = gAgent.getRegion()->getCapability("SearchStatTracking");
llinfos << "Sending click msg via capability (url=" << url << ")" << llendl;
llinfos << "body: [" << body << "]" << llendl;
LL_INFOS("FSPanelClassifiedInfo") << "Sending click msg via capability (url=" << url << ")" << LL_ENDL;
LL_INFOS("FSPanelClassifiedInfo") << "body: [" << body << "]" << LL_ENDL;
LLHTTPClient::post(url, body, new FSClassifiedClickMessageResponder());
}

6
indra/newview/fspanelprofileclassifieds.cpp
View File

@ -425,7 +425,7 @@ void FSPanelClassifieds::openClassifiedInfo(const LLSD &params)
void FSPanelClassifieds::openClassifiedEdit(const LLSD& params)
{
LLUUID classified_id = params["classified_id"].asUUID();;
llinfos << "opening classified " << classified_id << " for edit" << llendl;
LL_INFOS("FSPanelClassifieds") << "opening classified " << classified_id << " for edit" << LL_ENDL;
editClassified(classified_id);
}
@ -566,7 +566,7 @@ void FSPanelClassifieds::editClassified(const LLUUID& classified_id)
FSClassifiedItem* c_item = findClassifiedById(classified_id);
if (!c_item)
{
llwarns << "item not found for classified_id " << classified_id << llendl;
LL_WARNS("FSPanelClassifieds") << "item not found for classified_id " << classified_id << LL_ENDL;
return;
}
@ -654,7 +654,7 @@ void FSPanelClassifieds::closePanel(LLPanel* panel)
}
else
{
llwarns << "No underlying panel to focus." << llendl;
LL_WARNS("FSPanelClassifieds") << "No underlying panel to focus." << LL_ENDL;
}
}
}