From dd4a4409cd074e5b6747a3bc7dcbfebac4e6ba9f Mon Sep 17 00:00:00 2001 From: Steve Bennetts Date: Mon, 16 Nov 2009 17:46:43 -0800 Subject: Eliminated redundant selection callback for LLComboBox (mSelectionCallback). --- indra/newview/llnavigationbar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llnavigationbar.cpp') diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 794d73a5ad..0c2782fd8a 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -217,7 +217,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)); -- cgit v1.2.3 From 764afa899ee3a4b2f1fa1f32c13a918c2caad9a9 Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Wed, 18 Nov 2009 14:25:58 +0200 Subject: Fixed major bug EXT-2608 (Crash: Sometimes LLNavigationBar is trying to access deleted LLSearchHistory singleton when exiting from viewer). --HG-- branch : product-engine --- indra/newview/llnavigationbar.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llnavigationbar.cpp') diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index 794d73a5ad..a770fe15fb 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() -- cgit v1.2.3