1 files changed, 27 insertions, 12 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 12ad339..1f13bbb 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -967,17 +967,6 @@ void LLTextEditor::endSelection()
                 mIsSelecting = FALSE;
                 mSelectionEnd = mCursorPos;
         }
-        if (mParseHTML && mHTML.length() > 0)
-        {
-                        //Special handling for slurls
-                if ( (mSecondlifeURLcallback!=NULL) && !(*mSecondlifeURLcallback)(mHTML) )
-                {
-                        if (mURLcallback!=NULL) (*mURLcallback)(mHTML.c_str());
-
-                        //load_url(url.c_str());
-                }
-                mHTML="";
-        }
 }
 
 BOOL LLTextEditor::selectionContainsLineBreaks()
@@ -1408,6 +1397,7 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
         if( hasMouseCapture()  )
         {
                 gFocusMgr.setMouseCapture( NULL );
+                
                 handled = TRUE;
         }
 
@@ -2831,7 +2821,10 @@ void LLTextEditor::drawCursor()
                                 {
                                         mLastIMEPosition.mX = ime_pos.mX;
                                         mLastIMEPosition.mY = ime_pos.mY;
-                                        getWindow()->setLanguageTextInput( ime_pos );
+
+                                        ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
+                                        ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
+                                        getWindow()->setLanguageTextInput( ime_pos  );
                                 }
                         }
                 }
@@ -3814,6 +3807,22 @@ void LLTextEditor::findEmbeddedItemSegments()
 
 BOOL LLTextEditor::handleMouseUpOverSegment(S32 x, S32 y, MASK mask)
 {
+        if ( hasMouseCapture() )
+        {
+                // This mouse up was part of a click.
+                // Regardless of where the cursor is, see if we recently touched a link
+                // and launch it if we did.
+                if (mParseHTML && mHTML.length() > 0)
+                {
+                                //Special handling for slurls
+                        if ( (mSecondlifeURLcallback!=NULL) && !(*mSecondlifeURLcallback)(mHTML) )
+                        {
+                                if (mURLcallback!=NULL) (*mURLcallback)(mHTML.c_str());
+                        }
+                        mHTML="";
+                }
+        }
+
         return FALSE;
 }
 
@@ -4245,6 +4254,12 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end)
                         strpos = url.find(slurlID);
                 }
         
+                if (strpos < 0)
+                {
+                        slurlID="sl://";
+                        strpos = url.find(slurlID);
+                }
+        
                 if (strpos >= 0) 
                 {
                         strpos+=slurlID.length();