diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:49:38 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-01-08 23:49:38 +0200 |
| commit | 7d4de08fa9c43f6e21267cb861cbac8a9280e5ec (patch) | |
| tree | 6187d0f264efa1122a76245db6a1def6f1ca13c4 /indra/llprimitive/llmodel.cpp | |
| parent | a1c36a3218a7fe6eb7b646e64c6bf9bc29b24886 (diff) | |
| parent | 77395eddc911e0801e50fd693f7bbaee8046aa95 (diff) | |
Merge branch 'main' into DRTVWR-489
# Conflicts:
# indra/newview/llmaterialeditor.cpp
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index ee493968de..99a5697a84 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -52,7 +52,8 @@ const int MODEL_NAMES_LENGTH = sizeof(model_names) / sizeof(std::string); LLModel::LLModel(LLVolumeParams& params, F32 detail) : LLVolume(params, detail), - mNormalizedScale(1,1,1), + mNormalizedScale(1,1,1), + mNormalizedTranslation(0, 0, 0), mPelvisOffset( 0.0f ), mStatus(NO_ERRORS), mSubmodelID(0) |