summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaces.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
committerRichard Nelson <richard@lindenlab.com>2009-08-04 01:12:59 +0000
commiteb853f55c07ae4a3c3f2aa05fbabcf2e4b4dc115 (patch)
tree7707fccb8d0946b6257d5ed7c5dfd3941c53eec0 /indra/newview/llpanelplaces.cpp
parentdb5cda26676f376f18816013c0c5e3fbad5b20d0 (diff)
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llpanelplaces.cpp')
-rw-r--r--indra/newview/llpanelplaces.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 1fb3eb8b71..31b2d01dcf 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -239,11 +239,10 @@ void LLPanelPlaces::onFilterEdit(const std::string& search_string)
{
mFilterSubString = search_string;
+ // Searches are case-insensitive
LLStringUtil::toUpper(mFilterSubString);
LLStringUtil::trimHead(mFilterSubString);
- mFilterEditor->setText(mFilterSubString);
-
mActivePanel->onSearchEdit(mFilterSubString);
}
}
@@ -480,7 +479,7 @@ void LLPanelPlaces::showLandmarkFoldersMenu()
{
if (mLandmarkFoldersMenuHandle.isDead())
{
- LLMenuGL::Params menu_p;
+ LLToggleableMenu::Params menu_p;
menu_p.name("landmarks_folders_menu");
menu_p.can_tear_off(false);
menu_p.visible(false);