summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-04-18 10:07:40 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-04-18 10:07:40 -0400
commitda7cd9f8117757cd6acb0a5e93bc3c60443374f9 (patch)
tree3916874ed180ee9567b4fb76d88d8ce72689c257 /indra/newview/llnavigationbar.cpp
parentd534c8009f2573400a21c19b00691536fc3cc23f (diff)
parentb8069d1c250c03e9fffda0a9264bfd04a12f8292 (diff)
merged from 2.6.4-start tag in 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;
}