diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/llui/lllineeditor.h | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/llui/lllineeditor.h')
| -rw-r--r-- | indra/llui/lllineeditor.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h index 339aad30fb..48d68b9935 100644 --- a/indra/llui/lllineeditor.h +++ b/indra/llui/lllineeditor.h @@ -105,10 +105,7 @@ public: Optional<S32> text_pad_left, text_pad_right; - Ignored is_unicode, - drop_shadow_visible, - border_drop_shadow_visible, - bg_visible; + Ignored bg_visible; Params(); }; @@ -280,6 +277,7 @@ private: virtual void getPreeditRange(S32 *position, S32 *length) const; virtual BOOL getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const; virtual S32 getPreeditFontSize() const; + virtual LLWString getPreeditString() const { return getWText(); } protected: LLUIString mText; // The string being edited. |