aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-30 12:06:24 -0700
committerJacek Antonelli2010-06-19 02:43:28 -0500
commitf84be715969a9f4267df677ac39d0f98ee9be68b (patch)
tree29a4213be7f9cfa353ba883f5e6bec63fc1b782f
parentApplied patch for SNOW-586 by Thickbrick Sleaford: Add option to align textur... (diff)
downloadmeta-impy-f84be715969a9f4267df677ac39d0f98ee9be68b.zip
meta-impy-f84be715969a9f4267df677ac39d0f98ee9be68b.tar.gz
meta-impy-f84be715969a9f4267df677ac39d0f98ee9be68b.tar.bz2
meta-impy-f84be715969a9f4267df677ac39d0f98ee9be68b.tar.xz
Made align planar textures apply when checked, shortened up the label
Was accidentally left out of a rebase
-rw-r--r--linden/indra/newview/llpanelface.cpp1
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tools.xml4
2 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index bd9edec..68e603e 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -1153,6 +1153,7 @@ void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata)
1153{ 1153{
1154 LLPanelFace* self = (LLPanelFace*) userdata; 1154 LLPanelFace* self = (LLPanelFace*) userdata;
1155 self->getState(); 1155 self->getState();
1156 self->sendTextureInfo();
1156} 1157}
1157 1158
1158// static 1159// static
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 78eacf4..45b827e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1158,9 +1158,9 @@
1158 </combo_item> 1158 </combo_item>
1159 </combo_box> 1159 </combo_box>
1160 <check_box bottom="-148" follows="left|top" font="SansSerifSmall" height="16" 1160 <check_box bottom="-148" follows="left|top" font="SansSerifSmall" height="16"
1161 initial_value="false" enabled="false" label="Align across planar faces" 1161 initial_value="false" enabled="false" label="Align planar textures"
1162 left="8" mouse_opaque="true" name="checkbox planar align" width="160" 1162 left="8" mouse_opaque="true" name="checkbox planar align" width="160"
1163 tool_tip="When checked, aligns textures on all selected faces to the last selected face. Requires Planar texture mapping." /> 1163 tool_tip="Aligns textures on all selected faces to the last selected face. Requires Planar texture mapping." />
1164 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 1164 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
1165 bottom="-158" drop_shadow_visible="true" follows="left|top" 1165 bottom="-158" drop_shadow_visible="true" follows="left|top"
1166 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10" 1166 font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"