aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterlandmark.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaterlandmark.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaterlandmark.cpp')
-rw-r--r--linden/indra/newview/llfloaterlandmark.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterlandmark.cpp b/linden/indra/newview/llfloaterlandmark.cpp
index e10dec9..71e35e8 100644
--- a/linden/indra/newview/llfloaterlandmark.cpp
+++ b/linden/indra/newview/llfloaterlandmark.cpp
@@ -180,7 +180,7 @@ BOOL LLFloaterLandmark::handleDragAndDrop(
180 BOOL drop, 180 BOOL drop,
181 EDragAndDropType cargo_type, void *cargo_data, 181 EDragAndDropType cargo_type, void *cargo_data,
182 EAcceptance *accept, 182 EAcceptance *accept,
183 LLString& tooltip_msg) 183 std::string& tooltip_msg)
184{ 184{
185 BOOL handled = FALSE; 185 BOOL handled = FALSE;
186 186
@@ -442,12 +442,12 @@ void LLFloaterLandmark::onShowFolders(LLUICtrl* ctrl, void *user_data)
442 } 442 }
443} 443}
444 444
445void LLFloaterLandmark::onSearchEdit(const LLString& search_string, void* user_data ) 445void LLFloaterLandmark::onSearchEdit(const std::string& search_string, void* user_data )
446{ 446{
447 LLFloaterLandmark* picker = (LLFloaterLandmark*)user_data; 447 LLFloaterLandmark* picker = (LLFloaterLandmark*)user_data;
448 448
449 std::string upper_case_search_string = search_string; 449 std::string upper_case_search_string = search_string;
450 LLString::toUpper(upper_case_search_string); 450 LLStringUtil::toUpper(upper_case_search_string);
451 451
452 if (upper_case_search_string.empty()) 452 if (upper_case_search_string.empty())
453 { 453 {