diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-05-09 18:00:23 -0400 |
commit | 77c39cef5292ca9fcd13aafeb074ef2b715baed8 (patch) | |
tree | 90e19b4b9c73d9f9721bc628f50cf5de6829a0ba /indra/llui/llloadingindicator.h | |
parent | 0994f9485534c35ca92b4ce1421544b7de8feea2 (diff) | |
parent | f7bd5b98949fc72ac1fd4b97ecd4907e14c04315 (diff) |
merged .hgtags from viewer-pre-beta
Diffstat (limited to 'indra/llui/llloadingindicator.h')
-rw-r--r-- | indra/llui/llloadingindicator.h | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/indra/llui/llloadingindicator.h b/indra/llui/llloadingindicator.h index 4e4a224ef6..c0cb1cc74a 100644 --- a/indra/llui/llloadingindicator.h +++ b/indra/llui/llloadingindicator.h @@ -36,8 +36,8 @@ /** * Perpetual loading indicator (a la MacOSX or YouTube) * - * Number of rotations per second can be overriden - * with the "roations_per_sec" parameter. + * Number of rotations per second can be overridden + * with the "images_per_sec" parameter. * * Can start/stop spinning. * @@ -49,11 +49,24 @@ class LLLoadingIndicator { LOG_CLASS(LLLoadingIndicator); public: + + struct Images : public LLInitParam::Block<Images> + { + Multiple<LLUIImage*> image; + + Images() + : image("image") + {} + }; + struct Params : public LLInitParam::Block<Params, LLUICtrl::Params> { - Optional<F32> rotations_per_sec; + Optional<F32> images_per_sec; + Batch<Images> images; + Params() - : rotations_per_sec("rotations_per_sec", 1.0f) + : images_per_sec("images_per_sec", 1.0f), + images("images") {} }; @@ -74,14 +87,15 @@ public: private: LLLoadingIndicator(const Params&); - friend class LLUICtrlFactory; + void initFromParams(const Params&); - class Data; + friend class LLUICtrlFactory; - F32 mRotationsPerSec; + F32 mImagesPerSec; S8 mCurImageIdx; - LLPointer<LLUIImage> mCurImagep; LLFrameTimer mImageSwitchTimer; + + std::vector<LLUIImagePtr> mImages; }; #endif // LL_LLLOADINGINDICATOR_H |