diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
| commit | 7c42711ca3a4e67b95473aa5129dce5ff19bea15 (patch) | |
| tree | 593c0bedf07bffc79ec4640b157839edf61260f5 /indra/newview/llviewerobject.cpp | |
| parent | e0e6e7fd747121442370fc811c84aa34ed612f64 (diff) | |
| parent | 9f6b8484dfb7dfa981d8a8ac3693d3f68e32bc12 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 654f2aa1de..8af0057c88 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -7513,9 +7513,9 @@ void LLViewerObject::setGLTFAsset(const LLUUID& id) LLSculptParams* sculpt_params = (LLSculptParams*)param->data; sculpt_params->setSculptTexture(id, LL_SCULPT_TYPE_GLTF); - + setParameterEntryInUse(LLNetworkData::PARAMS_SCULPT, true, true); - + // Update the volume LLVolumeParams volume_params; volume_params.setSculptID(id, LL_SCULPT_TYPE_GLTF); @@ -7532,7 +7532,7 @@ public: const LLSD& input) const { LLSD object_data = input["body"]["ObjectData"]; - S32 num_entries = object_data.size(); + S32 num_entries = static_cast<S32>(object_data.size()); for ( S32 i = 0; i < num_entries; i++ ) { |