diff options
Diffstat (limited to 'linden/indra/llui/lluictrlfactory.cpp')
-rw-r--r-- | linden/indra/llui/lluictrlfactory.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp index 475ef2e..79f7313 100644 --- a/linden/indra/llui/lluictrlfactory.cpp +++ b/linden/indra/llui/lluictrlfactory.cpp | |||
@@ -370,21 +370,22 @@ S32 LLUICtrlFactory::saveToXML(LLView* viewp, const LLString& filename) | |||
370 | //----------------------------------------------------------------------------- | 370 | //----------------------------------------------------------------------------- |
371 | // buildPanel() | 371 | // buildPanel() |
372 | //----------------------------------------------------------------------------- | 372 | //----------------------------------------------------------------------------- |
373 | void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename, | 373 | BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename, |
374 | const LLCallbackMap::map_t* factory_map) | 374 | const LLCallbackMap::map_t* factory_map) |
375 | { | 375 | { |
376 | BOOL didPost = FALSE; | ||
376 | LLXMLNodePtr root; | 377 | LLXMLNodePtr root; |
377 | 378 | ||
378 | if (!LLUICtrlFactory::getLayeredXMLNode(filename, root)) | 379 | if (!LLUICtrlFactory::getLayeredXMLNode(filename, root)) |
379 | { | 380 | { |
380 | return; | 381 | return didPost; |
381 | } | 382 | } |
382 | 383 | ||
383 | // root must be called panel | 384 | // root must be called panel |
384 | if( !root->hasName("panel" ) ) | 385 | if( !root->hasName("panel" ) ) |
385 | { | 386 | { |
386 | llwarns << "Root node should be named panel in : " << filename << llendl; | 387 | llwarns << "Root node should be named panel in : " << filename << llendl; |
387 | return; | 388 | return didPost; |
388 | } | 389 | } |
389 | 390 | ||
390 | if (factory_map) | 391 | if (factory_map) |
@@ -392,7 +393,7 @@ void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename, | |||
392 | mFactoryStack.push_front(factory_map); | 393 | mFactoryStack.push_front(factory_map); |
393 | } | 394 | } |
394 | 395 | ||
395 | panelp->initPanelXML(root, NULL, this); | 396 | didPost = panelp->initPanelXML(root, NULL, this); |
396 | 397 | ||
397 | if (LLUI::sShowXUINames) | 398 | if (LLUI::sShowXUINames) |
398 | { | 399 | { |
@@ -406,6 +407,8 @@ void LLUICtrlFactory::buildPanel(LLPanel* panelp, const LLString &filename, | |||
406 | { | 407 | { |
407 | mFactoryStack.pop_front(); | 408 | mFactoryStack.pop_front(); |
408 | } | 409 | } |
410 | |||
411 | return didPost; | ||
409 | } | 412 | } |
410 | 413 | ||
411 | //----------------------------------------------------------------------------- | 414 | //----------------------------------------------------------------------------- |