Skip to content

Commit

Permalink
Oh gawd this is gonna conflict with Shyotl..
Browse files Browse the repository at this point in the history
but you people wanted Render Weight for some reason... so here it is...
Now we'll send it to the server, rejoice.
  • Loading branch information
LiruMouse committed Apr 13, 2016
1 parent 9fee430 commit 56bc3ae
Show file tree
Hide file tree
Showing 9 changed files with 605 additions and 142 deletions.
2 changes: 2 additions & 0 deletions indra/newview/CMakeLists.txt
Expand Up @@ -123,6 +123,7 @@ set(viewer_SOURCE_FILES
llautoreplace.cpp llautoreplace.cpp
llavataractions.cpp llavataractions.cpp
llavatarpropertiesprocessor.cpp llavatarpropertiesprocessor.cpp
llavatarrenderinfoaccountant.cpp
llbox.cpp llbox.cpp
llcallbacklist.cpp llcallbacklist.cpp
llcallingcard.cpp llcallingcard.cpp
Expand Down Expand Up @@ -654,6 +655,7 @@ set(viewer_HEADER_FILES
llautoreplace.h llautoreplace.h
llavataractions.h llavataractions.h
llavatarpropertiesprocessor.h llavatarpropertiesprocessor.h
llavatarrenderinfoaccountant.h
llbox.h llbox.h
llcallbacklist.h llcallbacklist.h
llcallingcard.h llcallingcard.h
Expand Down
11 changes: 11 additions & 0 deletions indra/newview/app_settings/settings.xml
Expand Up @@ -14117,6 +14117,17 @@ This should be as low as possible, but too low may break functionality</string>
<integer>0</integer> <integer>0</integer>
</map> </map>


<key>RenderAutoMuteLogging</key>
<map>
<key>Comment</key>
<string>Show extra information in viewer logs about avatar rendering costs</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderAutoHideSurfaceAreaLimit</key> <key>RenderAutoHideSurfaceAreaLimit</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
Expand Down
4 changes: 4 additions & 0 deletions indra/newview/llappviewer.cpp
Expand Up @@ -89,6 +89,7 @@
#include "llcrashlogger.h" #include "llcrashlogger.h"
#include "llweb.h" #include "llweb.h"
#include "llsecondlifeurls.h" #include "llsecondlifeurls.h"
#include "llavatarrenderinfoaccountant.h"


// Linden library includes // Linden library includes
#include "llavatarnamecache.h" #include "llavatarnamecache.h"
Expand Down Expand Up @@ -4192,6 +4193,9 @@ void LLAppViewer::idle()
gObjectList.updateApparentAngles(gAgent); gObjectList.updateApparentAngles(gAgent);
} }


// Update AV render info
LLAvatarRenderInfoAccountant::idle();

// Execute deferred tasks. // Execute deferred tasks.
{ {
LAZY_FT("DeferredTaskRun"); LAZY_FT("DeferredTaskRun");
Expand Down

0 comments on commit 56bc3ae

Please sign in to comment.