Commit 9a42100b authored by Kitty Barnett's avatar Kitty Barnett

Merged with .Catznip tip

--HG--
branch : Catznip
parents 1482848f 90edf6ad
......@@ -54,7 +54,7 @@ static LLPanelInjector<LLPanelInventoryOfferFolder> t_places("panel_offer_invfol
LLPanelInventoryOfferFolder::LLPanelInventoryOfferFolder()
: LLPanel()
{
buildFromFile("panel_offer_invfolder.xml");
setXMLFilename("panel_offer_invfolder.xml");
}
// virtual
......
......@@ -572,6 +572,7 @@ LLPanel* LLToastNotifyPanel::createPanel(const LLSD& form_element)
LLPanel* pPanel = LLRegisterPanelClass::instance().createPanelClass(form_element["class"].asString());
if (pPanel)
{
pPanel->buildFromFile(pPanel->getXMLFilename());
pPanel->reshape(mControlPanel->getRect().getWidth(), pPanel->getRect().getHeight());
}
return pPanel;
......
......@@ -53,9 +53,8 @@
relative_width="1" />
</scroll_list>
<panel
class="panel_offer_invfolder"
class="panel_offer_invfolder"
height="23"
filename="panel_offer_invfolder.xml"
follows="bottom|left|right"
layout="topleft"
left="10"
......
......@@ -79,9 +79,8 @@
relative_width="1" />
</scroll_list>
<panel
class="panel_offer_invfolder"
class="panel_offer_invfolder"
height="23"
filename="panel_offer_invfolder.xml"
follows="bottom|left|right"
layout="topleft"
left="10"
......
......@@ -38,9 +38,8 @@
top_pad="0"
width="284" />
<panel
class="panel_offer_invfolder"
class="panel_offer_invfolder"
height="23"
filename="panel_offer_invfolder.xml"
follows="bottom|left|right"
layout="topleft"
left="10"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment