summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmediasettingspermissions.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-24 10:22:20 +0100
commit8de8669f340179324f47668dbd9102ba4f8526bd (patch)
tree663f02ab3761092aec66682c139617f64a2407bc /indra/newview/llpanelmediasettingspermissions.cpp
parent528964429633b5f878216ba0ffa80c69abc70205 (diff)
parentb25d969b61eb1e4f114ee0e632d1de9777780e9f (diff)
merge from viewer-development
Diffstat (limited to 'indra/newview/llpanelmediasettingspermissions.cpp')
-rw-r--r--indra/newview/llpanelmediasettingspermissions.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingspermissions.cpp b/indra/newview/llpanelmediasettingspermissions.cpp
index 339376cbf6..5378886b56 100644
--- a/indra/newview/llpanelmediasettingspermissions.cpp
+++ b/indra/newview/llpanelmediasettingspermissions.cpp
@@ -59,7 +59,7 @@ LLPanelMediaSettingsPermissions::LLPanelMediaSettingsPermissions() :
mPermsWorldControl( 0 )
{
// build dialog from XML
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_media_settings_permissions.xml");
+ buildFromFile( "panel_media_settings_permissions.xml");
}
////////////////////////////////////////////////////////////////////////////////