From 58bce2d205bee3f5adb33b15efe73098e77429eb Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Wed, 9 Sep 2009 01:26:44 +0000
Subject: merge -r132032-132812
 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1

---
 indra/newview/lllocationinputctrl.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index f54a614f62..d8c89690e8 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -42,6 +42,7 @@
 #include "llstring.h"
 #include "lltrans.h"
 #include "lluictrlfactory.h"
+#include "lltooltip.h"
 
 // newview includes
 #include "llinventorymodel.h"
@@ -290,12 +291,13 @@ void LLLocationInputCtrl::hideList()
 		focusTextEntry();
 }
 
-BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
+BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect& sticky_rect_screen)
 {
 	// Let the buttons show their tooltips.
 	if (LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen) && !msg.empty())
 	{
-		if (mList->getRect().pointInRect(x, y)) {
+		if (mList->getRect().pointInRect(x, y)) 
+		{
 			S32 loc_x, loc_y;
 			//x,y - contain coordinates related to the location input control, but without taking the expanded list into account
 			//So we have to convert it again into local coordinates of mList
@@ -307,7 +309,7 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
 				LLSD value = item->getValue();
 				if (value.has("tooltip"))
 				{
-					msg = value["tooltip"].asString();
+					LLToolTipMgr::instance().show(value["tooltip"]);
 				}
 			}
 		}
@@ -315,8 +317,7 @@ BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect*
 		return TRUE;
 	}
 
-	msg = LLUI::sShowXUINames ? getShowNamesToolTip() : "";
-	return mTextEntry->getRect().pointInRect(x, y);
+	return FALSE;
 }
 
 BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
-- 
cgit v1.2.3


From 4601aef70abe611a2a25b3e236cc089ff2bcb6af Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 9 Sep 2009 04:27:06 +0000
Subject: merge -r 1586-1593
 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
 Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873

---
 indra/newview/lllocationinputctrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/lllocationinputctrl.cpp')

diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index d8c89690e8..1d9220cf3d 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -324,7 +324,7 @@ BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
 {
 	BOOL result = LLComboBox::handleKeyHere(key, mask);
 
-	if (key == KEY_DOWN && hasFocus() && mList->getItemCount() != 0)
+	if (key == KEY_DOWN && hasFocus() && mList->getItemCount() != 0 && !mList->getVisible())
 	{
 		showList();
 	}
-- 
cgit v1.2.3