diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-20 19:49:41 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-20 19:49:41 +0200 |
| commit | 8758fac7124ff07f2a003bf5719c19a4dab170b9 (patch) | |
| tree | 102c57c6855dca1f107abfa2febf77b8441595c4 /indra/newview/lltexturectrl.h | |
| parent | da00631c638acbf3d3b6ecbe5edb5abecf03252c (diff) | |
Fixed bug EXT-4369 ([BSI] Changing image in "Pick" doesn't trigger "Save Pick" button to be active)
* Changed the Save button to react on texture picker commit, not on selection.
* Added an optional "no_commit_on_selection" parameter to LLTextureCtrl
to commit only when user presses the OK button in the picker or changes
the texture via DnD, i.e. browsing in the picker doesn't commit.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index fb1d591e32..023329a9b2 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -74,6 +74,7 @@ public: Optional<std::string> default_image_name; Optional<bool> allow_no_texture; Optional<bool> can_apply_immediately; + Optional<bool> no_commit_on_selection; // don't commit unless it's DnD or OK button press Optional<S32> label_width; Optional<LLUIColor> border_color; @@ -88,6 +89,7 @@ public: default_image_name("default_image_name"), allow_no_texture("allow_no_texture"), can_apply_immediately("can_apply_immediately"), + no_commit_on_selection("no_commit_on_selection", false), label_width("label_width", -1), border_color("border_color"), multiselect_text("multiselect_text"), @@ -204,6 +206,7 @@ private: PermissionMask mImmediateFilterPermMask; PermissionMask mNonImmediateFilterPermMask; BOOL mCanApplyImmediately; + BOOL mCommitOnSelection; BOOL mNeedsRawImageData; LLViewBorder* mBorder; BOOL mValid; |