diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-24 11:23:07 -0700 |
commit | b85cf7b12562a3359e52147d26eb1051ce388559 (patch) | |
tree | 3f656bb586e7cd2a25763d8053365e106365a063 /indra/newview/llpanelnearbymedia.cpp | |
parent | 24473fc0d619beaafab029170a7aacde5855be1a (diff) | |
parent | b34856d66dfa1a725cb85d813982709566b6db7a (diff) |
Pull update from viewer-development
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() |