diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-20 18:46:54 -0500 |
| commit | ad3dd05f4aea5db735b1c21bfccb34625a03f11d (patch) | |
| tree | 8058c31f361df612c588aaf8b92b0f55a5aa3f21 /indra/newview/llfloatertools.cpp | |
| parent | a6592b783628eb1c5ab2d51b66cd98399c0e88cc (diff) | |
| parent | c42ed54b0a532cb4e0ad30a1b0b5038cef9938f2 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index fa5d9b0892..653f838779 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1016,10 +1016,12 @@ S32 LLFloaterTools::calcRenderCost() LLSelectNode *select_node = *selection_iter; if (select_node) { - LLVOVolume *viewer_volume = (LLVOVolume*)select_node->getObject(); - if (viewer_volume) + LLViewerObject *vobj = select_node->getObject(); + if (vobj->getVolume()) { - cost += viewer_volume->getRenderCost(textures); + LLVOVolume* volume = (LLVOVolume*) vobj; + + cost += volume->getRenderCost(textures); for (LLVOVolume::texture_cost_t::iterator iter = textures.begin(); iter != textures.end(); ++iter) { // add the cost of each individual texture in the linkset |