Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llprimitive merge

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llpanelobject.cpp
View File

@@ -2141,17 +2141,17 @@ void LLPanelObject::sendSculpt()
return;
LLSculptParams sculpt_params;
LLUUID sculpt_id = LLUUID::null;
if (mCtrlSculptTexture)
sculpt_params.setSculptTexture(mCtrlSculptTexture->getImageAssetID());
sculpt_id = mCtrlSculptTexture->getImageAssetID();
U8 sculpt_type = 0;
if (mCtrlSculptType)
sculpt_type |= mCtrlSculptType->getCurrentIndex();
bool enabled = true;
enabled = sculpt_type != LL_SCULPT_TYPE_MESH;
bool enabled = sculpt_type != LL_SCULPT_TYPE_MESH;
if (mCtrlSculptMirror)
{
@@ -2168,7 +2168,7 @@ void LLPanelObject::sendSculpt()
if ((mCtrlSculptInvert) && (mCtrlSculptInvert->get()))
sculpt_type |= LL_SCULPT_FLAG_INVERT;
sculpt_params.setSculptType(sculpt_type);
sculpt_params.setSculptTexture(sculpt_id, sculpt_type);
mObject->setParameterEntry(LLNetworkData::PARAMS_SCULPT, sculpt_params, TRUE);
}