diff options
| author | Richard Linden <none@none> | 2012-02-09 17:14:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-09 17:14:37 -0800 |
| commit | aa345bd8f3844bdc2c5318d14b26343b91e6e573 (patch) | |
| tree | 4e6aac58946205a719f56462a2dce0b341a8729f /indra/llui | |
| parent | 4523b3137850df8922b12cc966633a3d5bb84374 (diff) | |
EXP-1874 FIX Unexpected scrollbar in text notification
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index e2d9a6cb81..35abe48510 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2380,6 +2380,8 @@ S32 LLTextBase::getEditableIndex(S32 index, bool increasing_direction) void LLTextBase::updateRects() { + mVisibleTextRect = getLocalRect(); + if (mLineInfoList.empty()) { mTextBoundingRect = LLRect(0, mVPad, mHPad, 0); @@ -2604,8 +2606,7 @@ BOOL LLTextSegment::handleScrollWheel(S32 x, S32 y, S32 clicks) { return FALSE; BOOL LLTextSegment::handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; } const std::string& LLTextSegment::getName() const { - static std::string empty_string(""); - return empty_string; + return LLStringUtil::null; } void LLTextSegment::onMouseCaptureLost() {} void LLTextSegment::screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {} |