diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:01:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-10-14 22:01:05 +0300 |
| commit | 42330f2008181d2246ae4684f1eaa299c1228166 (patch) | |
| tree | 55712fca315af466516de9effc4a5132d3a20d35 /indra/llprimitive/lldaeloader.h | |
| parent | a9f70ec80e3799489ec265b2eedcf77d5dc0d342 (diff) | |
| parent | a2c8c8238cfb109e0da81363995e08e99173426f (diff) | |
Merge branch 'master' into DRTVWR-483
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); |