diff options
author | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
commit | abe758d45fa3dd3524a4c7a9667e4f02c3de8eac (patch) | |
tree | 7ac140c51c22a42c693b0930898e0996a807ecb8 /indra/newview/llpanelnearbymedia.cpp | |
parent | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff) | |
parent | b124d45b4ef714acfe629af554768950dcdd5f2c (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelnearbymedia.cpp')
-rw-r--r-- | indra/newview/llpanelnearbymedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp index 811d70ade3..fcc67d6840 100644 --- a/indra/newview/llpanelnearbymedia.cpp +++ b/indra/newview/llpanelnearbymedia.cpp @@ -96,7 +96,7 @@ LLPanelNearByMedia::LLPanelNearByMedia() mCommitCallbackRegistrar.add("SelectedMediaCtrl.Zoom", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaZoom, this)); mCommitCallbackRegistrar.add("SelectedMediaCtrl.Unzoom", boost::bind(&LLPanelNearByMedia::onClickSelectedMediaUnzoom, this)); - LLUICtrlFactory::instance().buildPanel(this, "panel_nearby_media.xml"); + buildFromFile( "panel_nearby_media.xml"); } LLPanelNearByMedia::~LLPanelNearByMedia() |