diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 09:56:35 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-28 09:56:35 -0800 |
| commit | 9997587e390cc309e71cffb55f5cf6a9ad90da69 (patch) | |
| tree | fc54491e875a31799cfb41acde73363617ec586c /indra/llui | |
| parent | 9a4d075f3b8ab1ccf760187beeb81f9bf17e69b1 (diff) | |
| parent | da08cc05af85ac334cabd943a5d9fcbcaa1500b6 (diff) | |
PE merge.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lldraghandle.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index a93c666648..832f148902 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -113,6 +113,7 @@ void LLDragHandleTop::setTitle(const std::string& title) params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT); params.font_shadow(LLFontGL::DROP_SHADOW_SOFT); params.use_ellipses = true; + params.allow_html = false; //cancel URL replacement in floater title mTitleBox = LLUICtrlFactory::create<LLTextBox> (params); addChild( mTitleBox ); } diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 78386220d9..478e270c98 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1534,7 +1534,7 @@ LLRect LLScrollListCtrl::getCellRect(S32 row_index, S32 column_index) S32 rect_bottom = getRowOffsetFromIndex(row_index); LLScrollListColumn* columnp = getColumn(column_index); cell_rect.setOriginAndSize(rect_left, rect_bottom, - rect_left + columnp->getWidth(), mLineHeight); + /*rect_left + */columnp->getWidth(), mLineHeight); return cell_rect; } |