From f05df68656d2abdc38d86cd6746398fa90eb8614 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 1 Oct 2009 17:44:44 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3 * Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816 * Major Bugs: EXT-1142 (timeout during login due to processing group IMs) * Changes: EXT-1216 (minimize message well) --- indra/newview/llpanelplaces.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpanelplaces.cpp') diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index 4e070df7eb..80ecc95afb 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -337,7 +337,7 @@ void LLPanelPlaces::onFilterEdit(const std::string& search_string) LLStringUtil::trimHead(mFilterSubString); if (mActivePanel) - mActivePanel->onSearchEdit(mFilterSubString); + mActivePanel->onSearchEdit(mFilterSubString); } } @@ -386,7 +386,7 @@ void LLPanelPlaces::onTeleportButtonClicked() else { if (mActivePanel) - mActivePanel->onTeleport(); + mActivePanel->onTeleport(); } } @@ -432,7 +432,7 @@ void LLPanelPlaces::onShowOnMapButtonClicked() else { if (mActivePanel) - mActivePanel->onShowOnMap(); + mActivePanel->onShowOnMap(); } } @@ -510,7 +510,7 @@ void LLPanelPlaces::onOverflowMenuItemClicked(const LLSD& param) addChild(mPickPanel); mPickPanel->setExitCallback(boost::bind(&LLPanelPlaces::togglePickPanel, this, FALSE)); - } + } togglePickPanel(TRUE); @@ -733,7 +733,7 @@ void LLPanelPlaces::updateVerbs() else { if (mActivePanel) - mActivePanel->updateVerbs(); + mActivePanel->updateVerbs(); } } -- cgit v1.2.3