diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-08 12:09:00 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-08 12:09:00 -0400 |
commit | 90590a06040d95bf0853d0c1b340b3a2aae46e51 (patch) | |
tree | 8adcb88b38fe57524c01dadab91165b8febc1a8a /indra | |
parent | a6c7c7189ff84f88695a9ada1e7d9eb1a3872781 (diff) |
add markers for where the UI notice hooks go
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llavatarrenderinfoaccountant.cpp | 3 | ||||
-rwxr-xr-x | indra/newview/llvoavatar.cpp | 34 |
2 files changed, 14 insertions, 23 deletions
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp index 76d8d98186..b8ec1e150b 100644 --- a/indra/newview/llavatarrenderinfoaccountant.cpp +++ b/indra/newview/llavatarrenderinfoaccountant.cpp @@ -120,7 +120,8 @@ public: U32 overlimit = avatar_render_info[KEY_OVER_COMPLEXITY_LIMIT].asInteger(); LL_DEBUGS("AvatarRenderInfo") << "complexity limit: "<<reporting<<" reporting, "<<overlimit<<" over limit"<<LL_ENDL; - // @TODO call self with this info + //@TODO - at this point, pass reporting and overlimit to something + // that remembers them and when they change displays a message } if (avatar_render_info.has(KEY_AGENTS)) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 3106e2b6d1..b49ea1b4bb 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3105,27 +3105,6 @@ bool LLVOAvatar::isVisuallyMuted() const return muted; } -#if 0 // TBD -bool LLVOAvatar::isInMuteList() -{ - bool muted = false; - F64 now = LLFrameTimer::getTotalSeconds(); - if (now < mCachedMuteListUpdateTime) - { - muted = mCachedInMuteList; - } - else - { - muted = LLMuteList::getInstance()->isMuted(getID()); - - const F64 SECONDS_BETWEEN_MUTE_UPDATES = 1; - mCachedMuteListUpdateTime = now + SECONDS_BETWEEN_MUTE_UPDATES; - mCachedInMuteList = muted; - } - return muted; -} -#endif - void LLVOAvatar::updateDebugText() { // clear debug text @@ -8278,9 +8257,20 @@ void LLVOAvatar::idleUpdateRenderComplexity() void LLVOAvatar::updateVisualComplexity() { - LL_DEBUGS("AvatarRender") << "avatar " << this->getID() << " appearance changed" << LL_ENDL; + LL_DEBUGS("AvatarRender") << "avatar " << getID() << " appearance changed" << LL_ENDL; // Set the cache time to in the past so it's updated ASAP mVisualComplexityStale = true; + LLCachedControl<U32> show_my_complexity_changes(gSavedSettings, "ShowMyComplexityChanges", 5); + + if ( isSelf() && show_my_complexity_changes ) + { + // @TODO + LL_INFOS("AvatarRender") << "popup that displays my complexity (" << mVisualComplexity << ")" + << " for " << show_my_complexity_changes << " seconds" + << LL_ENDL; + } + + } // Calculations for mVisualComplexity value |