diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-14 14:13:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-14 14:13:30 -0400 |
| commit | ac3f7c2b6b72aa955c0aa1337b8f25c6f097b429 (patch) | |
| tree | d5954adeccf8ef19e66cdc8275521a5ea195e3cb /indra/newview/llnavigationbar.cpp | |
| parent | 1bd19e8ffe99c4a2d0df8936bf01a63ebc05258f (diff) | |
| parent | 7ea2a1f9cc998396f437ec2535ddb1d51cce46b1 (diff) | |
Automated merge with file:///Users/oz/Work/viewer-beta
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
| -rw-r--r-- | indra/newview/llnavigationbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 18bba6e358..58849393b4 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -272,7 +272,7 @@ LLNavigationBar::LLNavigationBar() mPurgeTPHistoryItems(false), mSaveToLocationHistory(false) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_navigation_bar.xml"); + buildFromFile( "panel_navigation_bar.xml"); // set a listener function for LoginComplete event LLAppViewer::instance()->setOnLoginCompletedCallback(boost::bind(&LLNavigationBar::handleLoginComplete, this)); |