diff options
| author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
| commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
| tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llpanelpick.cpp | |
| parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
| parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) | |
merge
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 0417c65f7a..2e87a8eecb 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -80,7 +80,7 @@ LLPanelPickInfo* LLPanelPickInfo::create() { LLPanelPickInfo* panel = new LLPanelPickInfo(); - buildPanel(panel, XML_PANEL_PICK_INFO); + panel->buildFromFile(XML_PANEL_PICK_INFO); return panel; } @@ -350,7 +350,7 @@ void LLPanelPickInfo::onClickBack() LLPanelPickEdit* LLPanelPickEdit::create() { LLPanelPickEdit* panel = new LLPanelPickEdit(); - buildPanel(panel, XML_PANEL_EDIT_PICK); + panel->buildFromFile(XML_PANEL_EDIT_PICK); return panel; } |