diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-02-13 20:44:38 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2013-02-13 20:44:38 +0200 |
| commit | c7cac7896ee4ccdd71dad432f1314b85987e78cf (patch) | |
| tree | 14c66365d351d3bc9a74ea84471bfec2b4ba36d6 /indra/newview | |
| parent | a536cf5f4b3a850ebcab566b814c39ed9da03ceb (diff) | |
CHUI-739 Fixed! FUI toolbars not displayed when switching between CHUI and release viewer : parsing declare values of Enums
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index de07ad510b..b2318f9158 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -241,8 +241,9 @@ bool LLToolBarView::loadToolbars(bool force_default) LLXUIParser parser; if (!err) { - parser.readXUI(root, toolbar_set, toolbar_file); + parser.readXUI(root, toolbar_set, toolbar_file); } + if (!err && !toolbar_set.validateBlock()) { llwarns << "Unable to validate toolbars from file: " << toolbar_file << llendl; @@ -254,8 +255,9 @@ bool LLToolBarView::loadToolbars(bool force_default) if (force_default) { llerrs << "Unable to load toolbars from default file : " << toolbar_file << llendl; - return false; - } + return false; + } + // Try to load the default toolbars return loadToolbars(true); } |