diff options
author | simon <none@none> | 2014-05-07 15:28:13 -0700 |
---|---|---|
committer | simon <none@none> | 2014-05-07 15:28:13 -0700 |
commit | a5568f942b449e48cad71e92acd67eaa22dd5e5d (patch) | |
tree | f266b99c9663fda8001cbde48aa5a6b1b9d7db68 /indra/newview/llfloatersettingsdebug.cpp | |
parent | 80a134ffcc68b277c10cc79dc9c7ca073148b41e (diff) | |
parent | dc4c184696b308b8f60fa1dd751b35e22bd47d62 (diff) |
Merge downstream version 3.7.8 code
Diffstat (limited to 'indra/newview/llfloatersettingsdebug.cpp')
-rwxr-xr-x | indra/newview/llfloatersettingsdebug.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 07f5220ab7..fb202b4c40 100755 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -194,8 +194,8 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp) if (!spinner1 || !spinner2 || !spinner3 || !spinner4 || !color_swatch) { - llwarns << "Could not find all desired controls by name" - << llendl; + LL_WARNS() << "Could not find all desired controls by name" + << LL_ENDL; return; } |