diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-10-14 14:46:16 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-10-14 14:46:16 -0600 |
| commit | 52af846672d1d4f1cb9ccd46239cff9c81400ed5 (patch) | |
| tree | 2f162a12cd3b0878fca6d1d37124ef5adb2fa7f7 /indra/llprimitive/lldaeloader.h | |
| parent | 846fc179b13ba06fe9a51be69d80e86d0f433a73 (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
DRTVWR-510 merge master 6.4.11
Diffstat (limited to 'indra/llprimitive/lldaeloader.h')
| -rw-r--r-- | indra/llprimitive/lldaeloader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lldaeloader.h b/indra/llprimitive/lldaeloader.h index 4e990dbe5e..2b211343e1 100644 --- a/indra/llprimitive/lldaeloader.h +++ b/indra/llprimitive/lldaeloader.h @@ -89,7 +89,7 @@ protected: //Verify that a controller matches vertex counts bool verifyController( domController* pController ); - static bool addVolumeFacesFromDomMesh(LLModel* model, domMesh* mesh); + static bool addVolumeFacesFromDomMesh(LLModel* model, domMesh* mesh, LLSD& log_msg); static bool createVolumeFacesFromDomMesh(LLModel* model, domMesh *mesh); static LLModel* loadModelFromDomMesh(domMesh* mesh); |