summaryrefslogtreecommitdiff
path: root/indra/llwindow/llpreeditor.h
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
committerMonroe Linden <monroe@lindenlab.com>2009-10-05 15:50:24 -0700
commit39ee2367a7e771890017fc3d663780437ea69bb2 (patch)
treeb84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/llwindow/llpreeditor.h
parent374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff)
parent6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff)
Merging due to changes since my last pull.
Diffstat (limited to 'indra/llwindow/llpreeditor.h')
-rw-r--r--indra/llwindow/llpreeditor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llpreeditor.h b/indra/llwindow/llpreeditor.h
index dd63a98606..fcb39515e7 100644
--- a/indra/llwindow/llpreeditor.h
+++ b/indra/llwindow/llpreeditor.h
@@ -94,7 +94,7 @@ public:
// Get the contents of this preeditor as a LLWString. If there is an active preedit,
// the returned LLWString contains it.
- virtual LLWString getWText() const = 0;
+ virtual LLWString getPreeditString() const = 0;
// Handle a UTF-32 char on this preeditor, i.e., add the character
// to the contents.