diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-14 21:50:02 +0000 |
| commit | 73caee4208a4e05f66583de099502012fd8415ea (patch) | |
| tree | ff9fa1b7b010e71fb62f26a32c912b5e266f3b23 /indra/newview/llsyswellitem.cpp | |
| parent | 1db494f58ad378b8028c1f071196be82af5fe964 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
Diffstat (limited to 'indra/newview/llsyswellitem.cpp')
| -rw-r--r-- | indra/newview/llsyswellitem.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp index 5ed8a8b604..7d9ebc7208 100644 --- a/indra/newview/llsyswellitem.cpp +++ b/indra/newview/llsyswellitem.cpp @@ -37,6 +37,7 @@ #include "llwindow.h" #include "v4color.h" +#include "lluicolortable.h" //--------------------------------------------------------------------------------- LLSysWellItem::LLSysWellItem(const Params& p) : LLScrollingPanel(p), @@ -76,7 +77,10 @@ void LLSysWellItem::onClickCloseBtn() //--------------------------------------------------------------------------------- void LLSysWellItem::updatePanel(BOOL allow_modify) { - //nothing to do here + S32 parent_width = getParent()->getRect().getWidth(); + S32 panel_height = getRect().getHeight(); + + reshape(parent_width, panel_height, TRUE); } //--------------------------------------------------------------------------------- @@ -91,13 +95,13 @@ BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask) //--------------------------------------------------------------------------------- void LLSysWellItem::onMouseEnter(S32 x, S32 y, MASK mask) { - setTransparentColor(LLColor4(0.3f, 0.3f, 0.3f, 1.0f)); + setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemSelected" )); } //--------------------------------------------------------------------------------- void LLSysWellItem::onMouseLeave(S32 x, S32 y, MASK mask) { - setTransparentColor(LLColor4(0.0f, 0.0f, 0.0f, 0.0f)); + setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" )); } //--------------------------------------------------------------------------------- |