summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-15 17:23:51 -0400
committerOz Linden <oz@lindenlab.com>2013-05-15 17:23:51 -0400
commit387732090b7464763f6b5788a50545db243ac4be (patch)
tree1023f4c5513a0cab5f5c343e653f2bf7c4c96d68 /indra/newview
parentad09e2111cd980117ae937b79155ef6c24e4567c (diff)
parent83608fedb76a346f0f69e1c73769723c4069d9fd (diff)
merge up to latest integration repo
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llvovolume.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_tools_texture.xml8
2 files changed, 7 insertions, 7 deletions
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" />