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

merge changes for storm-1989

master
Oz Linden 2013-12-16 13:30:00 -05:00
parent 01cdc87d05 56f9b9c048
commit 8df635f8bf
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -675,6 +675,7 @@ Jonathan Yap
STORM-1953
STORM-1957
OPEN-113
STORM-1989
STORM-1987
STORM-1986
STORM-1981

24
indra/newview/skins/default/xui/en/floater_model_preview.xml
View File

@ -212,11 +212,11 @@
follows="top|left"
height="20"
layout="topleft"
left="215"
left="222"
name="lod_mode_high"
top_delta="0"
visible="false"
width="135">
width="130">
<item
name="Triangle Limit"
value="Triangle Limit" />
@ -230,7 +230,7 @@
height="20"
increment="10"
layout="topleft"
left_pad="5"
left_pad="3"
name="lod_triangle_limit_high"
visible="false"
width="55" />
@ -342,10 +342,10 @@
follows="top|left"
height="20"
layout="topleft"
left="215"
left="222"
name="lod_mode_medium"
top_delta="0"
width="135">
width="130">
<item
name="Triangle Limit"
value="Triangle Limit" />
@ -359,7 +359,7 @@
height="20"
increment="10"
layout="topleft"
left_pad="5"
left_pad="3"
name="lod_triangle_limit_medium"
width="55" />
<spinner
@ -470,10 +470,10 @@
follows="top|left"
height="20"
layout="topleft"
left="215"
left="222"
name="lod_mode_low"
top_delta="0"
width="135">
width="130">
<item
name="Triangle Limit"
value="Triangle Limit" />
@ -487,7 +487,7 @@
height="20"
increment="10"
layout="topleft"
left_pad="5"
left_pad="3"
name="lod_triangle_limit_low"
width="55" />
<spinner
@ -598,10 +598,10 @@
follows="top|left"
height="20"
layout="topleft"
left="215"
left="222"
name="lod_mode_lowest"
top_delta="0"
width="135">
width="130">
<item
name="Triangle Limit"
value="Triangle Limit" />
@ -615,7 +615,7 @@
height="20"
increment="10"
layout="topleft"
left_pad="5"
left_pad="3"
name="lod_triangle_limit_lowest"
width="55" />
<spinner