diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
| commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
| tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/llui/llui.h | |
| parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) | |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/llui/llui.h')
| -rw-r--r-- | indra/llui/llui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h index 35c0bb478e..dbd295d4e8 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -665,8 +665,8 @@ template <typename T> LLRegisterWith<LLDestroyClassList> LLDestroyClass<T>::sReg // useful parameter blocks struct TimeIntervalParam : public LLInitParam::Choice<TimeIntervalParam> { - Option<F32> seconds; - Option<S32> frames; + Alternative<F32> seconds; + Alternative<S32> frames; TimeIntervalParam() : seconds("seconds"), frames("frames") |