summaryrefslogtreecommitdiff
path: root/indra/newview/llnavigationbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-28 17:38:54 -0700
committerRichard Linden <none@none>2011-03-28 17:38:54 -0700
commit84b179b0bf254ae039dfdba330d25ac2df1c0a67 (patch)
tree8e35dad1a88b3538722ee3d68891fa6ef9fdf779 /indra/newview/llnavigationbar.cpp
parent5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (diff)
parentd597efc0f365fa07de9b7c0641dc4297466bfae5 (diff)
Automated merge with file:///F:\code\viewer-autobuild2010
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;
}