diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-15 17:23:51 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-15 17:23:51 -0400 |
| commit | 387732090b7464763f6b5788a50545db243ac4be (patch) | |
| tree | 1023f4c5513a0cab5f5c343e653f2bf7c4c96d68 | |
| parent | ad09e2111cd980117ae937b79155ef6c24e4567c (diff) | |
| parent | 83608fedb76a346f0f69e1c73769723c4069d9fd (diff) | |
merge up to latest integration repo
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llvovolume.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_tools_texture.xml | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 26fbfe2bb0..5c445e9ed0 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1023,6 +1023,7 @@ Ryozu Kojima VWR-287 Sachi Vixen Sahkolihaa Contepomi + MATBUG-102 Saii Hallard SaintLEOlions Zimer Salahzar Stenvaag diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 8e811527eb..694ad82914 100755 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -4185,13 +4185,13 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, draw_info->mSpecColor = specColor; draw_info->mEnvIntensity = spec; draw_info->mSpecularMap = NULL; + draw_info->mMaterial = mat; + draw_info->mShaderMask = shader_mask; if (mat) { // We have a material. Update our draw info accordingly. - draw_info->mMaterial = mat; - draw_info->mShaderMask = shader_mask; - + if (!mat->getSpecularID().isNull()) { LLVector4 specColor; diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml index 5be3ca9d9f..626115bd5d 100644 --- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml +++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml @@ -644,8 +644,8 @@ layout="topleft" label_width="205" left="10" - max_val="180" - min_val="-180" + max_val="9999" + min_val="-9999" name="bumpyRot" width="265" /> @@ -707,8 +707,8 @@ layout="topleft" label_width="205" left="10" - max_val="180" - min_val="-180" + max_val="9999" + min_val="-9999" name="shinyRot" width="265" /> |