Fixed regression of #245

2 files changed, 8 insertions, 0 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 51f7ad6..8123af2 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -1079,6 +1079,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--)
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index c77f7ff..d8c3aa9 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1097,6 +1097,9 @@ void LLPreviewLSL::callbackLSLCompileFailed(const LLSD& compile_errors)
                 line < compile_errors.endArray();
                 line++)
         {
+                // Note: OpenSim screws up and sends the wrong values for (row, column).
+                // (As of 2010-09-06: rows start at -1 instead of 0, and columns start at
+                //  1 instead of 0) -- MC
                 LLSD row;
                 std::string error_message = line->asString();
                 LLStringUtil::stripNonprintable(error_message);