diff options
| author | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
| commit | fbcbfb88059b0d669592407205dd4167257a2395 (patch) | |
| tree | 7855a06b2bf542262c1d50a602d67244d0df6b5e /indra/newview/llsyswellwindow.cpp | |
| parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
| parent | 904776288c7f7ebd945e563567aafbcab387d0b2 (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); |