diff options
| author | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 21:53:54 +0100 |
| commit | c0034c520c6e61b64822e276316651ec6912bd98 (patch) | |
| tree | 910442027b6a2c1406d80ca93949755b54badf5c /linden/indra/llcommon/llerrorcontrol.h | |
| parent | Use all those cores for compile (diff) | |
| parent | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h (diff) | |
| download | meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.zip meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.gz meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.bz2 meta-impy-c0034c520c6e61b64822e276316651ec6912bd98.tar.xz | |
Merge branch 'mccabe-plugins' into plugins_merge
Conflicts:
linden/doc/contributions.txt
linden/indra/cmake/GStreamer.cmake
linden/indra/cmake/LLMedia.cmake
linden/indra/cmake/OPENAL.cmake
linden/indra/llmedia/CMakeLists.txt
linden/indra/llprimitive/material_codes.h
linden/indra/newview/chatbar_as_cmdline.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llfloatertos.cpp
linden/indra/newview/llstartup.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
linden/indra/newview/viewer_manifest.py
linden/install.xml
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/llcommon/llerrorcontrol.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h index a55d706..fae7547 100644 --- a/linden/indra/llcommon/llerrorcontrol.h +++ b/linden/indra/llcommon/llerrorcontrol.h | |||
| @@ -73,6 +73,7 @@ namespace LLError | |||
| 73 | void setFunctionLevel(const std::string& function_name, LLError::ELevel); | 73 | void setFunctionLevel(const std::string& function_name, LLError::ELevel); |
| 74 | void setClassLevel(const std::string& class_name, LLError::ELevel); | 74 | void setClassLevel(const std::string& class_name, LLError::ELevel); |
| 75 | void setFileLevel(const std::string& file_name, LLError::ELevel); | 75 | void setFileLevel(const std::string& file_name, LLError::ELevel); |
| 76 | void setTagLevel(const std::string& file_name, LLError::ELevel); | ||
| 76 | 77 | ||
| 77 | void configure(const LLSD&); | 78 | void configure(const LLSD&); |
| 78 | // the LLSD can configure all of the settings | 79 | // the LLSD can configure all of the settings |