Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer include llerrorlegacy.h. Updated llstl to include deletion utilites.

Browse Source
This commit is contained in:
Shyotl
2015-06-19 03:54:20 -05:00
parent 283f5298d5
commit 1c627317ec
634 changed files with 8200 additions and 12214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
indra/newview/llimview.cpp
View File

@@ -178,8 +178,8 @@ public:
/*virtual*/ void httpFailure(void)
{
llwarns << "LLViewerChatterBoxInvitationAcceptResponder error [status:"
<< mStatus << "]: " << mReason << llendl;
LL_WARNS() << "LLViewerChatterBoxInvitationAcceptResponder error [status:"
<< mStatus << "]: " << mReason << LL_ENDL;
//throw something back to the viewer here?
if ( gIMMgr )
{
@@ -447,8 +447,8 @@ void LLIMMgr::addMessage(
floater = findFloaterBySession(other_participant_id);
if (floater)
{
llinfos << "found the IM session " << new_session_id
<< " by participant " << other_participant_id << llendl;
LL_INFOS() << "found the IM session " << new_session_id
<< " by participant " << other_participant_id << LL_ENDL;
}
}
@@ -1055,11 +1055,11 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
{
if (session_id.isNull())
{
llwarns << "Creating LLFloaterIMPanel with null session ID" << llendl;
LL_WARNS() << "Creating LLFloaterIMPanel with null session ID" << LL_ENDL;
}
llinfos << "LLIMMgr::createFloater: from " << other_participant_id
<< " in session " << session_id << llendl;
LL_INFOS() << "LLIMMgr::createFloater: from " << other_participant_id
<< " in session " << session_id << LL_ENDL;
LLFloaterIMPanel* floater = new LLFloaterIMPanel(session_label, session_id, other_participant_id, dialog, ids);
LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
LLFloaterChatterBox::getInstance(LLSD())->addFloater(floater, FALSE, i_pt);
@@ -1182,7 +1182,7 @@ void LLIMMgr::loadIgnoreGroup()
file.open(filename);
if (file.is_open())
{
// llinfos << "loading group chat ignore from " << filename << "..." << llendl;
// LL_INFOS() << "loading group chat ignore from " << filename << "..." << LL_ENDL;
LLSDSerialize::fromXML(settings_llsd, file);
mIgnoreGroupList.clear();
@@ -1190,21 +1190,21 @@ void LLIMMgr::loadIgnoreGroup()
for(LLSD::array_const_iterator iter = settings_llsd.beginArray();
iter != settings_llsd.endArray(); ++iter)
{
// llinfos << "added " << iter->asUUID()
// << " to group chat ignore list" << llendl;
// LL_INFOS() << "added " << iter->asUUID()
// << " to group chat ignore list" << LL_ENDL;
mIgnoreGroupList.push_back( iter->asUUID() );
}
}
else
{
// llinfos << "can't load " << filename
// << " (probably it doesn't exist yet)" << llendl;
// LL_INFOS() << "can't load " << filename
// << " (probably it doesn't exist yet)" << LL_ENDL;
}
}
void LLIMMgr::saveIgnoreGroup()
{
// llinfos << "saving ignore_groups.xml" << llendl;
// LL_INFOS() << "saving ignore_groups.xml" << LL_ENDL;
std::string user_dir = gDirUtilp->getLindenUserDir(true);
if (!user_dir.empty())
@@ -1232,20 +1232,20 @@ void LLIMMgr::updateIgnoreGroup(const LLUUID& group_id, bool ignore)
if (getIgnoreGroup(group_id) == ignore)
{
// nothing to do
// llinfos << "no change to group " << group_id << ", it is already "
// << (ignore ? "" : "not ") << "ignored" << llendl;
// LL_INFOS() << "no change to group " << group_id << ", it is already "
// << (ignore ? "" : "not ") << "ignored" << LL_ENDL;
return;
}
else if (!ignore)
{
// change from ignored to not ignored
// llinfos << "unignoring group " << group_id << llendl;
// LL_INFOS() << "unignoring group " << group_id << LL_ENDL;
mIgnoreGroupList.remove(group_id);
}
else //if (ignore)
{
// change from not ignored to ignored
// llinfos << "ignoring group " << group_id << llendl;
// LL_INFOS() << "ignoring group " << group_id << LL_ENDL;
mIgnoreGroupList.push_back(group_id);
}
}
@@ -1260,11 +1260,11 @@ bool LLIMMgr::getIgnoreGroup(const LLUUID& group_id) const
if (found != mIgnoreGroupList.end())
{
// llinfos << "group " << group_id << " is ignored." << llendl;
// LL_INFOS() << "group " << group_id << " is ignored." << LL_ENDL;
return true;
}
}
// llinfos << "group " << group_id << " is not ignored." << llendl;
// LL_INFOS() << "group " << group_id << " is not ignored." << LL_ENDL;
return false;
}