diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 08:47:26 -0400 |
| commit | 3f43a36d3430e94046d40cb898a9fd34cce0f7d5 (patch) | |
| tree | c3c483b3ce49ea5fcabe3041213223112edfba86 /indra/newview/llpanelpick.cpp | |
| parent | 422780c88a98ad0b78c54a71189219de12992bc2 (diff) | |
| parent | 011f6f9ad07d0a71c9a392f5e25af2aad69110ee (diff) | |
merge fixes for VWR-23296
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
| -rw-r--r-- | indra/newview/llpanelpick.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 7615a93a49..271728220c 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -74,7 +74,7 @@ LLPanelPickInfo* LLPanelPickInfo::create() { LLPanelPickInfo* panel = new LLPanelPickInfo(); - LLUICtrlFactory::getInstance()->buildPanel(panel, XML_PANEL_PICK_INFO); + panel->buildFromFile(XML_PANEL_PICK_INFO); return panel; } @@ -344,7 +344,7 @@ void LLPanelPickInfo::onClickBack() LLPanelPickEdit* LLPanelPickEdit::create() { LLPanelPickEdit* panel = new LLPanelPickEdit(); - LLUICtrlFactory::getInstance()->buildPanel(panel, XML_PANEL_EDIT_PICK); + panel->buildFromFile(XML_PANEL_EDIT_PICK); return panel; } |