diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-01 09:34:41 -0400 |
| commit | 90b56ee9fa95ca8cc15e3abc81977f504eb32c5b (patch) | |
| tree | 581e4ba644ebf770dbdab292ea9f10d4b9404cb6 /indra/llui/lltextbase.h | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
| parent | 49bef4e122e3ab4c82962e25f4ec1803c4e0c600 (diff) | |
merge changes for 3.5.0-beta7
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index ad566a36d3..20a73387b5 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -41,6 +41,7 @@ #include <boost/signals2.hpp> +class LLScrollContainer; class LLContextMenu; class LLUrlMatch; @@ -434,6 +435,9 @@ public: virtual void appendWidget(const LLInlineViewSegment::Params& params, const std::string& text, bool allow_undo); boost::signals2::connection setURLClickedCallback(const commit_signal_t::slot_type& cb); + void setWordWrap(bool wrap); + LLScrollContainer* getScrollContainer() const { return mScroller; } + protected: // helper structs struct compare_bottom; @@ -634,7 +638,7 @@ protected: // support widgets LLContextMenu* mPopupMenu; LLView* mDocumentView; - class LLScrollContainer* mScroller; + LLScrollContainer* mScroller; // transient state S32 mReflowIndex; // index at which to start reflow. S32_MAX indicates no reflow needed. |