diff options
author | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2011-03-30 14:24:36 -0700 |
commit | 5f4a85be9111793f25261b0551460e09e1656f18 (patch) | |
tree | 3a85977c765291c93710ecc59abd5ae717d72b91 /indra/newview/llnavigationbar.cpp | |
parent | 2f190297f0ff37452b3e966c0878e14a6aacc41b (diff) | |
parent | 84b179b0bf254ae039dfdba330d25ac2df1c0a67 (diff) |
Automated merge with bundle:F:\code\viewer-social+c:\users\richard\appdata\local\temp\thg.l2uc4d\http__bitbucket.org_merov_linden_viewer-autobuild2010_j2aqwu.hg
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; } |