summaryrefslogtreecommitdiff
path: root/indra/newview/llmodelpreview.h
diff options
context:
space:
mode:
authorHoward Stearns <howard.stearns@gmail.com>2022-03-03 18:56:52 -0800
committerHoward Stearns <howard.stearns@gmail.com>2022-03-03 18:56:52 -0800
commit340213b3023ec1dcc58587f35d270a3ad1a1e83d (patch)
treedb39172caeda0071a03e973a6ae4d353e6866c58 /indra/newview/llmodelpreview.h
parent239a29ab5c67bef8ffc773b0f405d8cc4542cf34 (diff)
SL-9748 - Only supply a default physics shape if it is named default_physics_shape
Diffstat (limited to 'indra/newview/llmodelpreview.h')
-rw-r--r--indra/newview/llmodelpreview.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h
index 9105ad2716..c46f9197e7 100644
--- a/indra/newview/llmodelpreview.h
+++ b/indra/newview/llmodelpreview.h
@@ -217,8 +217,8 @@ private:
LLVOAvatar* getPreviewAvatar(void) { return mPreviewAvatar; }
// Count amount of original models, excluding sub-models
static U32 countRootModels(LLModelLoader::model_list models);
- LLModel* mLastSpecifiedPhysicsP{}; // As opposed to being found by name or LOD;
- std::string mLastSpecifiedPhysicsModelOriginalName{""}; // Since the above will have it's label bashed.
+ LLModel* mDefaultPhysicsShapeP{}; // If supplied by name in physics file.
+ bool mWarnOfUnmatchedPhyicsMeshes{false};
protected:
friend class LLModelLoader;