Merge

1 files changed, 13 insertions, 6 deletions

diff --git a/indra/newview/llsceneview.cpp b/indra/newview/llsceneview.cpp
index 112fa5b4e1..f7aa63e34d 100644
--- a/indra/newview/llsceneview.cpp
+++ b/indra/newview/llsceneview.cpp
@@ -33,6 +33,7 @@
 #include "llviewerregion.h"
 #include "llagent.h"
 #include "llvolumemgr.h"
+#include "llmeshrepository.h"
 
 LLSceneView* gSceneView = NULL;
 
@@ -129,17 +130,23 @@ void LLSceneView::draw()
 				visible_triangles[idx].push_back(visible);
 				triangles[idx].push_back(high_triangles);
 
-				S32 bytes = 0;
-				S32 visible_bytes = 0;
-
-				F32 streaming = object->getStreamingCost(&bytes, &visible_bytes);
-				total_streaming[idx] += streaming;
-				streaming_cost[idx].push_back(streaming);
+                F32 streaming = object->getStreamingCost();
+                total_streaming[idx] += streaming;
+                streaming_cost[idx].push_back(streaming);
 
 				F32 physics = object->getPhysicsCost();
 				total_physics[idx] += physics;
 				physics_cost[idx].push_back(physics);
 
+				S32 bytes = 0;
+				S32 visible_bytes = 0;
+                LLMeshCostData costs;
+                if (object->getCostData(costs))
+                {
+                    bytes = costs.getSizeTotal();
+                    visible_bytes = costs.getSizeByLOD(object->getLOD());
+                }
+
 				total_bytes[idx] += bytes;
 				total_visible_bytes[idx] += visible_bytes;
 			}