diff options
| author | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
| commit | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch) | |
| tree | feca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/lltoolbarview.cpp | |
| parent | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff) | |
| parent | e1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/lltoolbarview.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lltoolbarview.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 548cb7da7b..ed0f22f16a 100644..100755 --- 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); } @@ -605,7 +607,7 @@ BOOL LLToolBarView::handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetTyp BOOL LLToolBarView::handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar) { BOOL handled = FALSE; - LLInventoryItem* inv_item = (LLInventoryItem*)cargo_data; + LLInventoryObject* inv_item = static_cast<LLInventoryObject*>(cargo_data); LLAssetType::EType type = inv_item->getType(); if (type == LLAssetType::AT_WIDGET) |