diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-08-20 00:21:14 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-08-20 00:21:14 +0000 |
| commit | 06b079a24b743088ca51eea1a627f0b4e1722458 (patch) | |
| tree | 97d80b66da06aea42ac2c35c318187051cc2b835 /indra/llui/llpanel.cpp | |
| parent | 6bcf7a6fe64457ad5f1dc2939820e45182476842 (diff) | |
EXT-580 Add Friend button in the IM floater not disabled if already friends
EXT-579 Add Friend from the Im floater opens multiple invitation dialogs
sidebar should be up above bottom tray
reviewed by richard
Diffstat (limited to 'indra/llui/llpanel.cpp')
| -rw-r--r-- | indra/llui/llpanel.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index 1a948fdd00..da55ababab 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -94,7 +94,8 @@ LLPanel::LLPanel(const LLPanel::Params& p) mBorder(NULL), mLabel(p.label), mCommitCallbackRegistrar(false), - mEnableCallbackRegistrar(false) + mEnableCallbackRegistrar(false), + mXMLFilename("") { setIsChrome(FALSE); @@ -486,8 +487,13 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr outpu LLFastTimer timer(FTM_PANEL_SETUP); LLXMLNodePtr referenced_xml; - std::string xml_filename; - node->getAttributeString("filename", xml_filename); + std::string xml_filename = mXMLFilename; + + // if the panel didn't provide a filename, check the node + if (xml_filename.empty()) + { + node->getAttributeString("filename", xml_filename); + } if (!xml_filename.empty()) { |