diff options
| author | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
| commit | 1911993cc7761216c70b95e77b49da383c9e162d (patch) | |
| tree | 23ec59769bcaf192324e48141c94affe0ebf2ea0 /indra/newview/llsyswellwindow.cpp | |
| parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
| parent | 83c01b041d5b6527b3741b73d075afc4b7ad134c (diff) | |
merge
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 750fbe54a7..99342bb564 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -249,7 +249,7 @@ LLIMWellWindow::RowPanel::RowPanel(const LLSysWellWindow* parent, const LLUUID& S32 chicletCounter, const std::string& name, const LLUUID& otherParticipantId) : LLPanel(LLPanel::Params()), mChiclet(NULL), mParent(parent) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_activeim_row.xml", NULL); + buildFromFile( "panel_activeim_row.xml", NULL); // Choose which of the pre-created chiclets (IM/group) to use. // The other one gets hidden. @@ -346,7 +346,7 @@ LLIMWellWindow::ObjectRowPanel::ObjectRowPanel(const LLUUID& notification_id, bo : LLPanel() , mChiclet(NULL) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_active_object_row.xml", NULL); + buildFromFile( "panel_active_object_row.xml", NULL); initChiclet(notification_id); |