summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-04-06 15:20:51 -0700
committerRichard Linden <none@none>2011-04-06 15:20:51 -0700
commit1d34e7b90bb9b45e20051d777da5d24dc76dbd50 (patch)
tree4028d274dd824485f7a97d36a48b92e7ff72b357 /indra/newview/llnavigationbar.cpp
parentb5c834c6fdcee7d7238bebfc561ecee3ecca3589 (diff)
parent75ddf612ad29240d6d34b5044ae09e4295217766 (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r--indra/newview/llnavigationbar.cpp3
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;
}