summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-19 12:56:04 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-19 12:56:04 -0700
commit62011c2871bdb09b92c56d2959eed64ba6ec3e1f (patch)
tree800b0c726c361a05a8e7b3025c7a14cca26f89c9 /indra/newview/llvovolume.cpp
parent3f186aab7737d611e1b8a62e66a79828e3b5ef5b (diff)
Fix merge issues from genBBoxes optimizations fighting with genBBoxes optimizations and missing statics
Diffstat (limited to 'indra/newview/llvovolume.cpp')
-rwxr-xr-xindra/newview/llvovolume.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 113bdd2ce3..33b26494de 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1458,7 +1458,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global)
continue;
}
res &= face->genVolumeBBoxes(*volume, i,
- mRelativeXform, mRelativeXformInvTrans,
+ mRelativeXform, /*mRelativeXformInvTrans,*/
(mVolumeImpl && mVolumeImpl->isVolumeGlobal()) || force_global);
if (rebuild)