diff options
| author | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2013-06-26 11:55:03 -0500 |
| commit | bb66e722d3ebf62145784227178ccdd318189cf6 (patch) | |
| tree | cc28868865089c9a377e4db16f29e09893ed83e8 /indra/newview/llselectmgr.cpp | |
| parent | 280a9d9827e4e5e0e1408cc8f9c20ef792a6c714 (diff) | |
| parent | b717a28194eb6e5a2f9113c65abe62cb81141413 (diff) | |
Automated merge with https://bitbucket.org/davep/viewer-release-iqa-1366
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rwxr-xr-x | indra/newview/llselectmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 0cbdbe16a3..7b397d46f3 100755 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -91,7 +91,7 @@ #include "llvovolume.h" #include "pipeline.h" #include "llviewershadermgr.h" - +#include "llpanelface.h" #include "llglheaders.h" LLViewerObject* getSelectedParentObject(LLViewerObject *object) ; @@ -2534,7 +2534,7 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch) if (tep && !tep->getMaterialParams().isNull()) { LLMaterialPtr orig = tep->getMaterialParams(); - LLMaterialPtr p = new LLMaterial(orig->asLLSD()); + LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig); p->setNormalRepeat(normal_scale_s, normal_scale_t); p->setSpecularRepeat(specular_scale_s, specular_scale_t); @@ -2560,8 +2560,8 @@ void LLSelectMgr::adjustTexturesByScale(BOOL send_to_sim, BOOL stretch) if (tep && !tep->getMaterialParams().isNull()) { LLMaterialPtr orig = tep->getMaterialParams(); + LLMaterialPtr p = gFloaterTools->getPanelFace()->createDefaultMaterial(orig); - LLMaterialPtr p = new LLMaterial(orig->asLLSD()); p->setNormalRepeat(normal_scale_s, normal_scale_t); p->setSpecularRepeat(specular_scale_s, specular_scale_t); |