diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
| commit | be666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (patch) | |
| tree | 282683cfddf5c624a72cd3f21cd66f18818cba77 /indra/llui | |
| parent | 211529eee9a4cbb36961af75e94af73da920d08d (diff) | |
| parent | aba8b04cfc6763ee565a5ae9929e8be044272b08 (diff) | |
merge from product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltextbase.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index f56cb2eee7..c3dd4ae647 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -127,6 +127,10 @@ void LLDockableFloater::setVisible(BOOL visible) mDockControl.get()->repositionDockable(); } + if (visible) + { + LLFloater::setFrontmost(TRUE); + } LLFloater::setVisible(visible); } diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index 70d78c77cd..c376a73615 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -139,6 +139,7 @@ public: // TODO: add optional style parameter virtual void setText(const LLStringExplicit &utf8str , const LLStyle::Params& input_params = LLStyle::Params()); // uses default style virtual std::string getText() const; + void setMaxTextLength(S32 length) { mMaxTextByteLength = length; } // wide-char versions void setWText(const LLWString& text); |