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

8
indra/newview/llmediactrl.cpp
View File

@@ -416,7 +416,7 @@ BOOL LLMediaCtrl::handleKeyHere( KEY key, MASK mask )
//
void LLMediaCtrl::handleVisibilityChange ( BOOL new_visibility )
{
llinfos << "visibility changed to " << (new_visibility?"true":"false") << llendl;
LL_INFOS() << "visibility changed to " << (new_visibility?"true":"false") << LL_ENDL;
if(mMediaSource)
{
mMediaSource->setVisible( new_visibility );
@@ -559,7 +559,7 @@ void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type)
(LLStringUtil::compareInsensitive(url_in.substr(0, protocol2.length()), protocol2) == 0))
{
// TODO: Print out/log this attempt?
// llinfos << "Rejecting attempt to load restricted website :" << urlIn << llendl;
// LL_INFOS() << "Rejecting attempt to load restricted website :" << urlIn << LL_ENDL;
return;
}
@@ -589,7 +589,7 @@ void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::str
}
if(expanded_filename.empty())
{
llwarns << "File " << filename << "not found" << llendl;
LL_WARNS() << "File " << filename << "not found" << LL_ENDL;
return;
}
if (ensureMediaSourceExists())
@@ -698,7 +698,7 @@ bool LLMediaCtrl::ensureMediaSourceExists()
}
else
{
llwarns << "media source create failed " << llendl;
LL_WARNS() << "media source create failed " << LL_ENDL;
// return;
}
}