Moved base up to 1.22

1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewertexteditor.cpp b/linden/indra/newview/llviewertexteditor.cpp
index 1dda1ca..3e2cc19 100644
--- a/linden/indra/newview/llviewertexteditor.cpp
+++ b/linden/indra/newview/llviewertexteditor.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -616,7 +616,10 @@ BOOL LLViewerTextEditor::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* s
                 LLView *viewp = *child_iter;
                 S32 local_x = x - viewp->getRect().mLeft;
                 S32 local_y = y - viewp->getRect().mBottom;
-                if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
+                if( viewp->pointInView(local_x, local_y) 
+                        && viewp->getVisible() 
+                        && viewp->getEnabled()
+                        && viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
                 {
                         return TRUE;
                 }