SH-541 - Physics mesh display shows inconsistent data.

The object UI was allowing the user to set 'prim' physics for meshes for which
no user physics had been uploaded, or decomposed.  It defaulted to convex hull in that case.

The fix is to fix the UI to disallow 'prim' for meshes without physics meshes, limiting
those to only convex hull and none.

We will also redo the task validation to detect invalid states related to this as part
of the 'redo the validation' work

1 files changed, 6 insertions, 0 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 1ff11f2c01..8d5ef4ae3d 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2667,6 +2667,12 @@ void LLMeshRepository::buildHull(const LLVolumeParams& params, S32 detail)
 	LLPrimitive::sVolumeManager->unrefVolume(volume);
 }
 
+bool LLMeshRepository::hasPhysicsShape(const LLUUID& mesh_id)
+{
+	LLSD mesh = mThread->getMeshHeader(mesh_id);
+	return mesh.has("physics_shape") && mesh["physics_shape"].has("size") && (mesh["physics_shape"]["size"].asInteger() > 0);
+}
+
 const LLSD& LLMeshRepository::getMeshHeader(const LLUUID& mesh_id)
 {
 	return mThread->getMeshHeader(mesh_id);