diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-10 14:08:12 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-10 14:08:12 -0500 |
| commit | 3cda7606380109beb3f331b8b53d38914f8ba8f5 (patch) | |
| tree | 337f4edadac1bbd9ef74021b2539f159f7637ba3 /indra/newview/llfloatertools.cpp | |
| parent | d55576278b0fbde314b98de9dcd74e8afd65ee8c (diff) | |
Added test code for volume raycast octree and fixed a crash in render cost calculation when selecting trees/grass. Reviewed by jwolk.
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 |