summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingsgeneral.cpp
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-09-30 12:00:29 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-09-30 12:00:29 -0700
commit60f8c8279071b791fbc7179d8bc2bb9ca4880a03 (patch)
tree20a513fdb383dfd36ca0dbe0a99eacd72faad835 /indra/newview/llpanelmediasettingsgeneral.cpp
parent569f3f4b06fc2f5a0fa658a49d519428983403f9 (diff)
parentd95b08c4a6830fc8a2319e77242d8f76eb4cbdae (diff)
Merge
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.cpp')
-rw-r--r--indra/newview/llpanelmediasettingsgeneral.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp
index 92c8365a70..2856ea9db1 100644
--- a/indra/newview/llpanelmediasettingsgeneral.cpp
+++ b/indra/newview/llpanelmediasettingsgeneral.cpp
@@ -74,7 +74,7 @@ LLPanelMediaSettingsGeneral::LLPanelMediaSettingsGeneral() :
mMediaEditable(false)
{
// build dialog from XML
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_settings_general.xml");
+ buildFromFile( "panel_media_settings_general.xml");
}
////////////////////////////////////////////////////////////////////////////////