llprimitive merge

This commit is contained in:
Shyotl
2016-04-08 19:32:13 -05:00
parent 691a5395ca
commit d40256fb31
10 changed files with 72 additions and 31 deletions

View File

@@ -1370,7 +1370,7 @@ void LLObjectBackup::xmlToPrim(LLSD prim_llsd, LLViewerObject* object)
LLUUID t_id = sculpt.getSculptTexture();
if (mAssetMap.count(t_id))
{
sculpt.setSculptTexture(mAssetMap[t_id]);
sculpt.setSculptTexture(mAssetMap[t_id], sculpt.getSculptType());
}
object->setParameterEntry(LLNetworkData::PARAMS_SCULPT, sculpt, true);