diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-21 17:09:04 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-21 17:09:04 -0700 |
| commit | 8b7a4c503c1a64480cdd411012cae94880bf143f (patch) | |
| tree | 59a528e48aa2e85bfdb02fdf268bf7881a7fc68e /indra/newview | |
| parent | d187ee8e59787f15b5be1b1d811e0345aa05e8bd (diff) | |
NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool to avoid changing objects sharing a material
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 15e5f9f740..1bb12e495d 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2523,8 +2523,10 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch) LLTextureEntry* tep = object->getTE(te_num); if (tep && !tep->getMaterialParams().isNull()) { - LLMaterialPtr p = tep->getMaterialParams(); + LLMaterialPtr orig = tep->getMaterialParams(); + LLMaterialPtr p = new LLMaterial(orig->asLLSD()); p->setNormalRepeat(scale_s * 0.5f, scale_t * 0.5f); + selectionSetMaterial( p ); } } break; @@ -2534,8 +2536,10 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch) LLTextureEntry* tep = object->getTE(te_num); if (tep && !tep->getMaterialParams().isNull()) { - LLMaterialPtr p = tep->getMaterialParams(); + LLMaterialPtr orig = tep->getMaterialParams(); + LLMaterialPtr p = new LLMaterial(orig->asLLSD()); p->setSpecularRepeat(scale_s * 0.5f, scale_t * 0.5f); + selectionSetMaterial( p ); } } break; |