diff options
author | Dave Parks <davep@lindenlab.com> | 2011-02-08 15:54:52 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-02-08 15:54:52 -0600 |
commit | ebf0dd4dce6d2c3f9f7415f548bca3da217821f8 (patch) | |
tree | b835ff9a36df7864816802f53a19b7d147c204ae /indra/newview/llselectmgr.cpp | |
parent | a242129b571daa8c6137c79931e31f9d43422abc (diff) | |
parent | bfbd8e22cb11277f3c43be8f8d9cb0ffa9451a76 (diff) |
Merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 29a16ccc97..746ba274ed 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -6391,7 +6391,7 @@ U32 LLObjectSelection::getSelectedObjectTriangleCount() return count; } -S32 LLObjectSelection::getSelectedObjectRenderCost() +/*S32 LLObjectSelection::getSelectedObjectRenderCost() { S32 cost = 0; LLVOVolume::texture_cost_t textures; @@ -6415,7 +6415,7 @@ S32 LLObjectSelection::getSelectedObjectRenderCost() return cost; -} +}*/ //----------------------------------------------------------------------------- |