diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-25 13:32:17 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-25 13:32:17 +0200 |
| commit | 088056c5bf4adc589c7fcc65236b90a466e59705 (patch) | |
| tree | 9f3967255a46a396adf51fd39d3859cfa385e633 /indra/newview/lltexturectrl.h | |
| parent | 7fc90e2385c6376599818a3a7a3d815535671178 (diff) | |
| parent | 149c56ae429b0dc8ebf349027fe855066b3447f7 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 023329a9b2..8ca92c3d87 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -74,7 +74,8 @@ 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<bool> no_commit_on_selection; // alternative mode: commit occurs and the widget gets dirty + // only on DnD or when OK is pressed in the picker Optional<S32> label_width; Optional<LLUIColor> border_color; |