Merge pull request #2513 from secondlife/lua-merge-dev

Merge develop branch into Lua project branch.

1 files changed, 10 insertions, 0 deletions

diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
index 93106b344f..35963c2b99 100644
--- a/indra/llui/llviewmodel.cpp
+++ b/indra/llui/llviewmodel.cpp
@@ -82,11 +82,20 @@ void LLTextViewModel::setValue(const LLSD& value)
     // approximate LLSD storage usage
     LLViewModel::setValue(value);
     mDisplay = utf8str_to_wstring(mStringValue = value.asString());
+    mDisplayGeneration++;
 
     // mDisplay and mValue agree
     mUpdateFromDisplay = false;
 }
 
+LLWString& LLTextViewModel::getEditableDisplay()
+{
+    mDirty = true;
+    mDisplayGeneration++;
+    mUpdateFromDisplay = true;
+    return mDisplay;
+}
+
 void LLTextViewModel::setDisplay(const LLWString& value)
 {
     // This is the strange way to alter the value. Normally we'd setValue()
@@ -94,6 +103,7 @@ void LLTextViewModel::setDisplay(const LLWString& value)
     // value. But a text editor might want to edit the display string
     // directly, then convert back to UTF8 on commit.
     mDisplay = value;
+    mDisplayGeneration++;
     mDirty = true;
     // Don't immediately convert to UTF8 -- do it lazily -- we expect many
     // more setDisplay() calls than getValue() calls. Just flag that it needs