From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llfloaterlandmark.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llfloaterlandmark.cpp')

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(
 		BOOL drop,
 		EDragAndDropType cargo_type, void *cargo_data, 
 		EAcceptance *accept,
-		LLString& tooltip_msg)
+		std::string& tooltip_msg)
 {
 	BOOL handled = FALSE;
 
@@ -442,12 +442,12 @@ void LLFloaterLandmark::onShowFolders(LLUICtrl* ctrl, void *user_data)
 	}
 }
 
-void LLFloaterLandmark::onSearchEdit(const LLString& search_string, void* user_data )
+void LLFloaterLandmark::onSearchEdit(const std::string& search_string, void* user_data )
 {
 	LLFloaterLandmark* picker = (LLFloaterLandmark*)user_data;
 
 	std::string upper_case_search_string = search_string;
-	LLString::toUpper(upper_case_search_string);
+	LLStringUtil::toUpper(upper_case_search_string);
 
 	if (upper_case_search_string.empty())
 	{
-- 
cgit v1.1