diff options
author | Aidan Thornton | 2011-03-13 20:51:10 +0000 |
---|---|---|
committer | Jacek Antonelli | 2011-05-27 21:09:07 -0500 |
commit | aa3b8631d31cda97aa2ba8e0828b9f8cfc80fd2b (patch) | |
tree | 5dcfcbe22a06efb6a5a9f9f051e771b27657641f /linden/indra/newview/llvoavatar.h | |
parent | Don't show [CHANNEL] on the login panel, it's not used anymore. (diff) | |
download | meta-impy-aa3b8631d31cda97aa2ba8e0828b9f8cfc80fd2b.zip meta-impy-aa3b8631d31cda97aa2ba8e0828b9f8cfc80fd2b.tar.gz meta-impy-aa3b8631d31cda97aa2ba8e0828b9f8cfc80fd2b.tar.bz2 meta-impy-aa3b8631d31cda97aa2ba8e0828b9f8cfc80fd2b.tar.xz |
Auto-deRuth code, by way of Siana Gearz and the Phoenix viewer.
[ From Tonya Souther's 672:143c811ee5e2 and 688:1900969ebf65 in phoenix-sg ]
(cherry picked from commit d3ffe737a82e4bf54ce1413efeb7e92f43dfccca)
Diffstat (limited to 'linden/indra/newview/llvoavatar.h')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index b9e4d17..5dbc945 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -372,12 +372,15 @@ public: | |||
372 | public: | 372 | public: |
373 | BOOL isFullyLoaded(); | 373 | BOOL isFullyLoaded(); |
374 | BOOL updateIsFullyLoaded(); | 374 | BOOL updateIsFullyLoaded(); |
375 | protected: | ||
376 | void updateRuthTimer(bool loading); | ||
375 | private: | 377 | private: |
376 | BOOL mFullyLoaded; | 378 | BOOL mFullyLoaded; |
377 | BOOL mPreviousFullyLoaded; | 379 | BOOL mPreviousFullyLoaded; |
378 | BOOL mFullyLoadedInitialized; | 380 | BOOL mFullyLoadedInitialized; |
379 | S32 mFullyLoadedFrameCounter; | 381 | S32 mFullyLoadedFrameCounter; |
380 | LLFrameTimer mFullyLoadedTimer; | 382 | LLFrameTimer mFullyLoadedTimer; |
383 | LLFrameTimer mRuthTimer; | ||
381 | 384 | ||
382 | //-------------------------------------------------------------------- | 385 | //-------------------------------------------------------------------- |
383 | // Collision Volumes | 386 | // Collision Volumes |