diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/newview/llvoavatar.h | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rw-r--r-- | indra/newview/llvoavatar.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 74fdb72c84..9c2ffc2d77 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -913,6 +913,9 @@ public: static BOOL sJointDebug; static ETextureIndex sBakedTextureIndices[BAKED_TEXTURE_COUNT]; + static F32 sUnbakedTime; // Total seconds with >=1 unbaked avatars + static F32 sGreyTime; // Total seconds with >=1 grey avatars + //-------------------------------------------------------------------- // Texture Layer Sets and Global Colors //-------------------------------------------------------------------- @@ -977,6 +980,7 @@ protected: F32 mLastFadeDistance; F32 mMinPixelArea; // debug F32 mMaxPixelArea; // debug + BOOL mHasGrey; // debug //-------------------------------------------------------------------- // Global Colors @@ -1012,7 +1016,7 @@ protected: BOOL isFullyBaked(); void deleteLayerSetCaches(); - static BOOL areAllNearbyInstancesBaked(); + static BOOL areAllNearbyInstancesBaked(S32& grey_avatars); static void onBakedTextureMasksLoaded(BOOL success, LLViewerImage *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata); |