diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-07-17 17:36:33 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-07-17 17:36:33 +0300 |
| commit | d9341caf45fa888824c93d9c2b24fdb7659f181b (patch) | |
| tree | 923e35ad6197d9487f56f87dc6417c5972858bc5 /indra/newview/llpanelobject.cpp | |
| parent | 62c748936c42451d4a17c5321d804111203a9e4f (diff) | |
MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rwxr-xr-x | indra/newview/llpanelobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 420f8fde2e..5dd44b4444 100755 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1739,9 +1739,10 @@ 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; @@ -1765,7 +1766,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); } |