Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly

2 files changed, 38 insertions, 17 deletions

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 5441d0a..c1d8efa 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -439,7 +439,7 @@ S32 LLLineEditor::calculateCursorFromMouse( S32 local_mouse_x )
         {
                 for (S32 i = 0; i < mText.length(); i++)
                 {
-                        asterix_text += '*';
+                        asterix_text += (llwchar) 0x2022L;
                 }
                 wtext = asterix_text.c_str();
         }
@@ -1938,7 +1938,7 @@ void LLLineEditor::draw()
                 std::string text;
                 for (S32 i = 0; i < mText.length(); i++)
                 {
-                        text += '*';
+                        text += "\xe2\x80\xa2";
                 }
                 mText = text;
         }
@@ -2621,28 +2621,37 @@ BOOL LLLineEditor::prevalidateASCII(const LLWString &str)
 
 BOOL LLLineEditor::evaluateFloat()
 {
-        bool success;
-        F32 result = 0.f;
+        bool success = false;
         std::string expr = getText();
         LLStringUtil::toUpper(expr);
 
-        success = LLCalc::getInstance()->evalString(expr, result);
-
-        if (!success)
+        // user deleted the contents, nothing to evaluate -- MC
+        if (expr.empty())
         {
-                // Move the cursor to near the error on failure
-                setCursor(LLCalc::getInstance()->getLastErrorPos());
-                // *TODO: Translated error message indicating the type of error? Select error text?
+                return success;
         }
         else
         {
-                // Replace the expression with the result
-                std::string result_str = llformat("%f",result);
-                setText(result_str);
-                selectAll();
-        }
+                F32 result = 0.f;
+                success = LLCalc::getInstance()->evalString(expr, result);
 
-        return success;
+                if (!success)
+                {
+                        // Move the cursor to near the error on failure
+                        setCursor(LLCalc::getInstance()->getLastErrorPos());
+                        // *TODO: Translated error message indicating the type of error? Select error text?
+                }
+                else
+                {
+                        // Replace the expression with the result
+                        std::ostringstream result_str;
+                        result_str << result;
+                        setText(result_str.str());
+                        selectAll();
+                }
+
+                return success;
+        }
 }
 
 void LLLineEditor::onMouseCaptureLost()
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 51f7ad6..6e5cdc4 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -951,7 +951,14 @@ S32 LLTextEditor::getLineStart( S32 line ) const
         S32 segoffset = mLineStartList[line].mOffset;
         LLTextSegment* seg = mSegments[segidx];
         S32 res = seg->getStart() + segoffset;
-        if (res > seg->getEnd()) llerrs << "wtf" << llendl;
+        if (res > seg->getEnd()) 
+        {
+                //llerrs << "wtf" << llendl;
+                // This happens when creating a new notecard using the AO on certain opensims.
+                // Play it safe instead of bringing down the viewer - MC
+                llwarns << "BAD JOOJOO! Text length (" << res << ") greater than text end (" << seg->getEnd() << "). Setting line start to " << seg->getEnd() << llendl;
+                res = seg->getEnd();
+        }
         return res;
 }
 
@@ -1079,6 +1086,11 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
 
 void LLTextEditor::setCursor(S32 row, S32 column)
 {
+        // Make sure we're not trying to set the cursor anywhere 
+        // it can't go by always setting the min to 0 -- MC
+        row = (row < 0) ? 0 : row;
+        column = (column < 0) ? 0 : column;
+
         const llwchar* doc = mWText.c_str();
         const char CR = 10;
         while(row--)