diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:37:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-10 22:37:53 -0400 |
| commit | e2baffa940a5797f2055f13ceb9722de524b2ec3 (patch) | |
| tree | bf53bf6b8856a20d732f57d41a28a2c71941ac65 /indra/newview/llnavigationbar.cpp | |
| parent | 74787fda486a68e344caf125fc76c80ca9c40822 (diff) | |
| parent | c77fcfb7a8aeb2f271b050171bf0d6a9bd4c955b (diff) | |
merge changes for storm-610
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; } |