diff options
author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/newview/llnavigationbar.cpp | |
parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) |
branch merge
Diffstat (limited to 'indra/newview/llnavigationbar.cpp')
-rw-r--r-- | indra/newview/llnavigationbar.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 794d73a5ad..114d26af8a 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -186,7 +186,6 @@ LLNavigationBar::LLNavigationBar() LLNavigationBar::~LLNavigationBar() { mTeleportFinishConnection.disconnect(); - LLSearchHistory::getInstance()->save(); } BOOL LLNavigationBar::postBuild() @@ -217,7 +216,7 @@ BOOL LLNavigationBar::postBuild() mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this)); - mCmbLocation->setSelectionCallback(boost::bind(&LLNavigationBar::onLocationSelection, this)); + mCmbLocation->setCommitCallback(boost::bind(&LLNavigationBar::onLocationSelection, this)); mSearchComboBox->setCommitCallback(boost::bind(&LLNavigationBar::onSearchCommit, this)); |