diff options
author | James Cook <james@lindenlab.com> | 2010-06-01 14:33:44 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-06-01 14:33:44 -0700 |
commit | 49c221b9678c33d5dbe71a68ca35d0b28fff3edd (patch) | |
tree | 0214531fe7d433a220240b766d928f7a49e2ed92 /indra/llui/llbutton.h | |
parent | 010dba68ad923cf66b1e05e6969a21f7288fe78a (diff) | |
parent | 7ea46b968cf7df3afc1e879f90f1124157f5a79d (diff) |
Merge with dessie/viewer-public in prep to land code there
Diffstat (limited to 'indra/llui/llbutton.h')
-rw-r--r-- | indra/llui/llbutton.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index a4d81ed6c3..b251c3d65d 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -84,6 +84,7 @@ public: image_hover_unselected, image_disabled_selected, image_disabled, + image_flash, image_pressed, image_pressed_selected, image_overlay; @@ -246,6 +247,7 @@ public: void setImageHoverUnselected(LLPointer<LLUIImage> image); void setImageDisabled(LLPointer<LLUIImage> image); void setImageDisabledSelected(LLPointer<LLUIImage> image); + void setImageFlash(LLPointer<LLUIImage> image); void setImagePressed(LLPointer<LLUIImage> image); void setCommitOnReturn(BOOL commit) { mCommitOnReturn = commit; } @@ -310,6 +312,12 @@ private: LLPointer<LLUIImage> mImagePressed; LLPointer<LLUIImage> mImagePressedSelected; + /* There are two ways an image can flash- by making changes in color according to flash_color attribute + or by changing icon from current to the one specified in image_flash. Second way is used only if + the name of flash icon is different from "FlashIconAbsent" which is there by default. First way is used + otherwise. */ + LLPointer<LLUIImage> mImageFlash; + LLUIColor mHighlightColor; LLUIColor mFlashBgColor; |