diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
| commit | 33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch) | |
| tree | d30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/llfloateranimpreview.h | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
| parent | 89434ef6e64462041368ab26e049011fc84ae1e3 (diff) | |
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/llfloateranimpreview.h')
| -rw-r--r-- | indra/newview/llfloateranimpreview.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llfloateranimpreview.h b/indra/newview/llfloateranimpreview.h index 7031e9a716..f1c4a6b0d0 100644 --- a/indra/newview/llfloateranimpreview.h +++ b/indra/newview/llfloateranimpreview.h @@ -88,7 +88,6 @@ public: static void onBtnPlay(void*); static void onBtnStop(void*); - static void setUploadAmount(S32 amount) { sUploadAmount = amount; } static void onSliderMove(LLUICtrl*, void*); static void onCommitBaseAnim(LLUICtrl*, void*); static void onCommitLoop(LLUICtrl*, void*); @@ -129,8 +128,6 @@ protected: LLAnimPauseRequest mPauseRequest; std::map<std::string, LLUUID> mIDList; - - static S32 sUploadAmount; }; #endif // LL_LLFLOATERANIMPREVIEW_H |