diff options
author | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
---|---|---|
committer | Monroe Linden <monroe@lindenlab.com> | 2010-08-27 16:58:33 -0700 |
commit | b62b10dd260c8c01e82e5b206c17a410cedc79f4 (patch) | |
tree | 2ea582bb63476566ddabfbd5a0a8f3747eb3fc8e /indra/newview/llpanelnearbymedia.cpp | |
parent | bef304c0a34bfcd7997bd7799995229ddcc1de31 (diff) | |
parent | 51311875b6e23fa9475c42b6d15637aa668729c5 (diff) |
Post-convert merge by convert_monolith.py from ./viewer-experience
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() |