diff options
author | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:42 -0500 |
commit | ce28e056c20bf2723f565bbf464b87781ec248a2 (patch) | |
tree | ef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llfloaterurlentry.cpp | |
parent | Second Life viewer sources 1.19.1.4b (diff) | |
download | meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2 meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz |
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llfloaterurlentry.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterurlentry.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterurlentry.cpp b/linden/indra/newview/llfloaterurlentry.cpp index b2cc37f..e9c828b 100644 --- a/linden/indra/newview/llfloaterurlentry.cpp +++ b/linden/indra/newview/llfloaterurlentry.cpp | |||
@@ -38,7 +38,7 @@ | |||
38 | // project includes | 38 | // project includes |
39 | #include "llcombobox.h" | 39 | #include "llcombobox.h" |
40 | #include "llurlhistory.h" | 40 | #include "llurlhistory.h" |
41 | #include "llvieweruictrlfactory.h" | 41 | #include "lluictrlfactory.h" |
42 | #include "llwindow.h" | 42 | #include "llwindow.h" |
43 | #include "llviewerwindow.h" | 43 | #include "llviewerwindow.h" |
44 | 44 | ||
@@ -89,9 +89,9 @@ LLFloaterURLEntry::LLFloaterURLEntry(LLHandle<LLPanel> parent) | |||
89 | LLFloater(), | 89 | LLFloater(), |
90 | mPanelLandMediaHandle(parent) | 90 | mPanelLandMediaHandle(parent) |
91 | { | 91 | { |
92 | gUICtrlFactory->buildFloater(this, "floater_url_entry.xml"); | 92 | LLUICtrlFactory::getInstance()->buildFloater(this, "floater_url_entry.xml"); |
93 | 93 | ||
94 | mMediaURLEdit = LLUICtrlFactory::getComboBoxByName(this, "media_entry"); | 94 | mMediaURLEdit = getChild<LLComboBox>("media_entry"); |
95 | 95 | ||
96 | // Cancel button | 96 | // Cancel button |
97 | childSetAction("cancel_btn", onBtnCancel, this); | 97 | childSetAction("cancel_btn", onBtnCancel, this); |