SH-108/SH-88 Add better permissions block and physics_shape_type to uploaded mesh assets.

Reviewed by Falcon.

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index ecf75415ab..8b14af009c 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1257,6 +1257,12 @@ void LLMeshUploadThread::run()
 
 	// now upload the object asset
 	std::string url = mUploadObjectAssetCapability;
+
+	if (object_asset["objects"][0].has("permissions"))
+	{ //copy permissions from first available object to be used for coalesced object
+		object_asset["permissions"] = object_asset["objects"][0]["permissions"];
+	}
+
 	LLHTTPClient::post(url, object_asset, new LLHTTPClient::Responder());
 
 	mFinished = true;
@@ -2400,6 +2406,8 @@ LLSD LLMeshUploadThread::createObject(LLModelInstance& instance)
 
 	object_params["permissions"] = ll_create_sd_from_permissions(perm);
 
+	object_params["physics_shape_type"] = (U8)(LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL);
+
 	return object_params;
 }