diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:06:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:06:22 -0500 |
| commit | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (patch) | |
| tree | c0918615c3e549c03dc212e723b89a6bdd9e633f /indra/newview/llcolorswatch.h | |
| parent | 4dcf8288be0ba10637ab2dce8c3400fa28bf5972 (diff) | |
| parent | 29a36c21db57729ff86785745c90ffbf93875edb (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/llcolorswatch.h')
| -rw-r--r-- | indra/newview/llcolorswatch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h index a4ce1ca099..cd859ea128 100644 --- a/indra/newview/llcolorswatch.h +++ b/indra/newview/llcolorswatch.h @@ -61,6 +61,7 @@ public: Optional<commit_callback_t> select_callback; Optional<LLUIColor> border_color; Optional<S32> label_width; + Optional<S32> label_height; Optional<LLTextBox::Params> caption_text; Optional<LLViewBorder::Params> border; @@ -112,6 +113,7 @@ protected: commit_callback_t mOnCancelCallback; commit_callback_t mOnSelectCallback; S32 mLabelWidth; + S32 mLabelHeight; LLPointer<LLUIImage> mAlphaGradientImage; std::string mFallbackImageName; |