diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llpanelobject.cpp | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index dcfede70aa..ea18b2838f 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1162,6 +1162,9 @@ void LLPanelObject::onCommitParametric( LLUICtrl* ctrl, void* userdata ) if (selected_type == MI_SCULPT) { self->mObject->setParameterEntryInUse(LLNetworkData::PARAMS_SCULPT, TRUE, TRUE); + LLSculptParams *sculpt_params = (LLSculptParams *)self->mObject->getParameterEntry(LLNetworkData::PARAMS_SCULPT); + if (sculpt_params) + volume_params.setSculptID(sculpt_params->getSculptTexture(), 0); } else { |