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

20
indra/newview/llviewerkeyboard.cpp
View File

@@ -725,7 +725,7 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c
if (!function)
{
llerrs << "Can't bind key to function " << function_name << ", no function with this name found" << llendl;
LL_ERRS() << "Can't bind key to function " << function_name << ", no function with this name found" << LL_ENDL;
return FALSE;
}
@@ -738,13 +738,13 @@ BOOL LLViewerKeyboard::bindKey(const S32 mode, const KEY key, const MASK mask, c
if (index >= MAX_KEY_BINDINGS)
{
llerrs << "LLKeyboard::bindKey() - too many keys for mode " << mode << llendl;
LL_ERRS() << "LLKeyboard::bindKey() - too many keys for mode " << mode << LL_ENDL;
return FALSE;
}
if (mode >= MODE_COUNT)
{
llerrs << "LLKeyboard::bindKey() - unknown mode passed" << mode << llendl;
LL_ERRS() << "LLKeyboard::bindKey() - unknown mode passed" << mode << LL_ENDL;
return FALSE;
}
@@ -778,7 +778,7 @@ S32 LLViewerKeyboard::loadBindings(const std::string& filename)
if(filename.empty())
{
llerrs << " No filename specified" << llendl;
LL_ERRS() << " No filename specified" << LL_ENDL;
return 0;
}
@@ -810,35 +810,35 @@ S32 LLViewerKeyboard::loadBindings(const std::string& filename)
if (tokens_read == EOF)
{
llinfos << "Unexpected end-of-file at line " << line_count << " of key binding file " << filename << llendl;
LL_INFOS() << "Unexpected end-of-file at line " << line_count << " of key binding file " << filename << LL_ENDL;
fclose(fp);
return 0;
}
else if (tokens_read < 4)
{
llinfos << "Can't read line " << line_count << " of key binding file " << filename << llendl;
LL_INFOS() << "Can't read line " << line_count << " of key binding file " << filename << LL_ENDL;
continue;
}
// convert mode
if (!modeFromString(mode_string, &mode))
{
llinfos << "Unknown mode on line " << line_count << " of key binding file " << filename << llendl;
llinfos << "Mode must be one of FIRST_PERSON, THIRD_PERSON, EDIT, EDIT_AVATAR" << llendl;
LL_INFOS() << "Unknown mode on line " << line_count << " of key binding file " << filename << LL_ENDL;
LL_INFOS() << "Mode must be one of FIRST_PERSON, THIRD_PERSON, EDIT, EDIT_AVATAR" << LL_ENDL;
continue;
}
// convert key
if (!LLKeyboard::keyFromString(key_string, &key))
{
llinfos << "Can't interpret key on line " << line_count << " of key binding file " << filename << llendl;
LL_INFOS() << "Can't interpret key on line " << line_count << " of key binding file " << filename << LL_ENDL;
continue;
}
// convert mask
if (!LLKeyboard::maskFromString(mask_string, &mask))
{
llinfos << "Can't interpret mask on line " << line_count << " of key binding file " << filename << llendl;
LL_INFOS() << "Can't interpret mask on line " << line_count << " of key binding file " << filename << LL_ENDL;
continue;
}