diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-10-27 15:17:20 -0400 |
| commit | fa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch) | |
| tree | 3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llui/llscrolllistcolumn.h | |
| parent | fae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff) | |
| parent | d2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff) | |
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llui/llscrolllistcolumn.h')
| -rw-r--r-- | indra/llui/llscrolllistcolumn.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h index 12baea8e0c..b4d4a6d05e 100644 --- a/indra/llui/llscrolllistcolumn.h +++ b/indra/llui/llscrolllistcolumn.h @@ -95,7 +95,7 @@ public: Optional<ESortDirection, SortNames> sort_direction; Optional<bool> sort_ascending; - struct Width : public LLInitParam::Choice<Width> + struct Width : public LLInitParam::ChoiceBlock<Width> { Alternative<bool> dynamic_width; Alternative<S32> pixel_width; @@ -112,7 +112,7 @@ public: Optional<Width> width; // either an image or label is used in column header - struct Header : public LLInitParam::Choice<Header> + struct Header : public LLInitParam::ChoiceBlock<Header> { Alternative<std::string> label; Alternative<LLUIImage*> image; |