livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge.

master
Tofu Linden 2010-02-10 21:00:51 +00:00
parent efe1f7c6f6 409cade29d
commit da3ad612df
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lldrawpoolalpha.cpp
View File

@ -180,7 +180,7 @@ void LLDrawPoolAlpha::render(S32 pass)
if (LLPipeline::sFastAlpha && !deferred_render)
{
LLGLDisable blend_enable(GL_BLEND);
LLGLDisable blend_disable(GL_BLEND);
gGL.setAlphaRejectSettings(LLRender::CF_GREATER, 0.33f);
if (mVertexShaderLevel > 0)
{

65
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -67,80 +67,75 @@
</floater.string>
<button
follows="left|top"
height="20"
image_disabled="Tool_Zoom"
image_disabled_selected="Tool_Zoom"
image_selected="Tool_Zoom_Selected"
image_unselected="Tool_Zoom"
height="25"
image_bottom_pad="1"
image_overlay="Tool_Zoom"
image_selected="PushButton_Selected_Press"
layout="topleft"
left="10"
name="button focus"
tool_tip="Focus"
width="20">
width="35">
<button.commit_callback
function="BuildTool.setTool"
parameter="Focus" />
</button>
<button
follows="left|top"
height="20"
image_disabled="Tool_Grab"
image_disabled_selected="Tool_Grab"
image_selected="Tool_Grab_Selected"
image_unselected="Tool_Grab"
height="25"
image_bottom_pad="1"
image_overlay="Tool_Grab"
image_selected="PushButton_Selected_Press"
layout="topleft"
left_pad="20"
left_pad="10"
name="button move"
tool_tip="Move"
width="20">
width="35">
<button.commit_callback
function="BuildTool.setTool"
parameter="Move" />
</button>
<button
follows="left|top"
height="20"
image_disabled="Tool_Face"
image_disabled_selected="Tool_Face"
image_selected="Tool_Face_Selected"
image_unselected="Tool_Face"
height="25"
image_bottom_pad="1"
image_overlay="Tool_Face"
image_selected="PushButton_Selected_Press"
layout="topleft"
left_pad="20"
left_pad="10"
name="button edit"
tool_tip="Edit"
width="20">
width="35">
<button.commit_callback
function="BuildTool.setTool"
parameter="Edit" />
</button>
<button
follows="left|top"
height="20"
image_disabled="Tool_Create"
image_disabled_selected="Tool_Create"
image_selected="Tool_Create_Selected"
image_unselected="Tool_Create"
height="25"
image_bottom_pad="1"
image_overlay="Tool_Create"
image_selected="PushButton_Selected_Press"
layout="topleft"
left_pad="20"
left_pad="10"
name="button create"
tool_tip="Create"
width="20">
width="35">
<button.commit_callback
function="BuildTool.setTool"
parameter="Create" />
</button>
<button
follows="left|top"
height="20"
image_disabled="Tool_Dozer"
image_disabled_selected="Tool_Dozer"
image_selected="Tool_Dozer_Selected"
image_unselected="Tool_Dozer"
height="25"
image_bottom_pad="1"
image_overlay="Tool_Dozer"
image_selected="PushButton_Selected_Press"
layout="topleft"
left_pad="20"
left_pad="10"
name="button land"
tool_tip="Land"
width="20">
width="35">
<button.commit_callback
function="BuildTool.setTool"
parameter="Land" />
@ -1043,7 +1038,7 @@ even though the user gets a free copy.
<check_box
height="15"
width="110"
top_pad="3"
top_pad="5"
label="Show in search"
layout="topleft"
left="100"