From 941cb9f4124c9ccfd5c845bc94639fa46df12c3d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 1 Apr 2008 17:45:04 +0000 Subject: merge release@83343 skinning-1-merge@83714 -> release QAR-424 --- indra/newview/llfloaterurlentry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfloaterurlentry.cpp') diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index e9e2584b17..400927632c 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -38,7 +38,7 @@ // project includes #include "llcombobox.h" #include "llurlhistory.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llwindow.h" #include "llviewerwindow.h" @@ -89,9 +89,9 @@ LLFloaterURLEntry::LLFloaterURLEntry(LLHandle parent) LLFloater(), mPanelLandMediaHandle(parent) { - gUICtrlFactory->buildFloater(this, "floater_url_entry.xml"); + LLUICtrlFactory::getInstance()->buildFloater(this, "floater_url_entry.xml"); - mMediaURLEdit = LLUICtrlFactory::getComboBoxByName(this, "media_entry"); + mMediaURLEdit = getChild("media_entry"); // Cancel button childSetAction("cancel_btn", onBtnCancel, this); -- cgit v1.3