1 files changed, 5 insertions, 2 deletions

diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index f43b7d2..e45f97b 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -33,6 +33,7 @@
 #include "lltextbox.h"
 #include "lluictrlfactory.h"
 #include "llfocusmgr.h"
+#include "llwindow.h"
 
 static LLRegisterWidget<LLTextBox> r("text");
 
@@ -193,12 +194,14 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
 
 BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask)
 {
+        BOOL handled = LLView::handleHover(x,y,mask);
         if(mHoverActive)
         {
                 mHasHover = TRUE; // This should be set every frame during a hover.
-                return TRUE;
+                getWindow()->setCursor(UI_CURSOR_ARROW);
         }
-        return LLView::handleHover(x,y,mask);
+
+        return (handled || mHasHover);
 }
 
 void LLTextBox::setText(const LLStringExplicit& text)