diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-10-11 10:40:05 -0700 |
| commit | 92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch) | |
| tree | a07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/llpanelmediasettingssecurity.cpp | |
| parent | c2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff) | |
| parent | 48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff) | |
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llpanelmediasettingssecurity.cpp')
| -rw-r--r-- | indra/newview/llpanelmediasettingssecurity.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingssecurity.cpp b/indra/newview/llpanelmediasettingssecurity.cpp index a0d4c2f761..b588e8f930 100644 --- a/indra/newview/llpanelmediasettingssecurity.cpp +++ b/indra/newview/llpanelmediasettingssecurity.cpp @@ -53,7 +53,7 @@ LLPanelMediaSettingsSecurity::LLPanelMediaSettingsSecurity() : mCommitCallbackRegistrar.add("Media.whitelistDelete", boost::bind(&LLPanelMediaSettingsSecurity::onBtnDel, this)); // build dialog from XML - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_settings_security.xml"); + buildFromFile( "panel_media_settings_security.xml"); } //////////////////////////////////////////////////////////////////////////////// |