diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-21 16:26:07 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-07-21 16:26:07 -0400 |
| commit | 4311ee30ec52260f38ac20e70a0fc1847cc4b7d0 (patch) | |
| tree | 6738b27749ac8dae67a27ae91a84f93e359cf541 /indra/newview | |
| parent | 8b8fdd0bdd3a26fc889ebdfac73d7805fda7123b (diff) | |
| parent | 0ddf718d9266fa1262d6e1f0f6d1e537048e8388 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llvovolume.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index bbe929b7f7..b5fdca632b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4877,6 +4877,10 @@ void LLViewerObject::adjustAudioGain(const F32 gain) bool LLViewerObject::unpackParameterEntry(U16 param_type, LLDataPacker *dp) { + if (LLNetworkData::PARAMS_MESH == param_type) + { + param_type = LLNetworkData::PARAMS_SCULPT; + } ExtraParameter* param = getExtraParameterEntryCreate(param_type); if (param) { diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 4723ec9bd1..367a3f5732 100644..100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1017,6 +1017,9 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams ¶ms_in, const S32 detail, bo if (is404) { setIcon(LLViewerTextureManager::getFetchedTextureFromFile("icons/Inv_Mesh.png", TRUE, LLViewerTexture::BOOST_UI)); + //render prim proxy when mesh loading attempts give up + volume_params.setSculptID(LLUUID::null, LL_SCULPT_TYPE_NONE); + } if ((LLPrimitive::setVolume(volume_params, lod, (mVolumeImpl && mVolumeImpl->isVolumeUnique()))) || mSculptChanged) |