diff options
author | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-04-01 14:13:05 -0700 |
commit | 878b0e2da1b91f06757b349640e1ac22bccb3a55 (patch) | |
tree | 0cb57ebd49ad77879d02181998938730fffa3954 /indra/newview/llnavigationbar.cpp | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 84f242ff4fc7743e909f53695a4e7a51c3c60299 (diff) |
Automated merge with http://bitbucket.org/merov_linden/viewer-autobuild2010
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r-- | indra/newview/llnavigationbar.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 3b160ddc8e..b8832dfd8e 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -57,6 +57,7 @@ #include "llviewercontrol.h" #include "llfloatermediabrowser.h" #include "llweb.h" +#include "llhints.h" #include "llinventorymodel.h" #include "lllandmarkactions.h" @@ -324,6 +325,8 @@ BOOL LLNavigationBar::postBuild() LLTeleportHistory::getInstance()->setHistoryChangedCallback( boost::bind(&LLNavigationBar::onTeleportHistoryChanged, this)); + LLHints::registerHintTarget("nav_bar", LLView::getHandle()); + return TRUE; } |