diff --git a/doc/contributions.txt b/doc/contributions.txt
index 26fbfe2bb0c5452affaa537100fa0777df0bc1f7..5c445e9ed00162dd726a100c06fdbece23df520d 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 8e811527eb6deae7a590cf54ce1380f334b65573..694ad82914a896089b25c96191fd96f67220ad40 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 5be3ca9d9fc5de933ecd4eac93211dbe125b01eb..626115bd5d0606562e0a04a62439563a77e41f2d 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" />