diff options
| author | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-08-30 09:33:05 -0400 |
| commit | 6f2820bcd7b7ed06fefeca0e2c34c45ef77e4b62 (patch) | |
| tree | 1ba73003f2b299d6ab1a2b968c5d15688be23692 /indra/llmath | |
| parent | 71ac45a28b238bac4ac0cf43ee85f04589ffa116 (diff) | |
| parent | 8cef480b96dc779c5879f74224fb0a185ee550f2 (diff) | |
merge
Diffstat (limited to 'indra/llmath')
| -rwxr-xr-x | indra/llmath/llvolume.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index b2fe9ba6c2..1a95f9cd46 100755 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -2734,7 +2734,7 @@ void LLVolume::cacheOptimize() S32 LLVolume::getNumFaces() const { - return (S32)mProfilep->mFaces.size(); + return mIsMeshAssetLoaded ? getNumVolumeFaces() : (S32)mProfilep->mFaces.size(); } |