diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-04 09:14:58 -0500 |
| commit | efa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch) | |
| tree | 39a949e1570c3524c8560522b693328fc7d9afbf /indra/newview/llpaneltopinfobar.cpp | |
| parent | eed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff) | |
| parent | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff) | |
merge up to viewer-development
Diffstat (limited to 'indra/newview/llpaneltopinfobar.cpp')
| -rw-r--r-- | indra/newview/llpaneltopinfobar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp index 0d17fb3e82..a9ca7314ce 100644 --- a/indra/newview/llpaneltopinfobar.cpp +++ b/indra/newview/llpaneltopinfobar.cpp @@ -66,7 +66,7 @@ LLPanelTopInfoBar::LLPanelTopInfoBar(): mParcelChangedObserver(0) LLUICtrl::CommitCallbackRegistry::currentRegistrar() .add("TopInfoBar.Action", boost::bind(&LLPanelTopInfoBar::onContextMenuItemClicked, this, _2)); - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_topinfo_bar.xml"); + buildFromFile( "panel_topinfo_bar.xml"); } LLPanelTopInfoBar::~LLPanelTopInfoBar() |