Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start to fix silver skin

Browse Source
This commit is contained in:
Hazim Gazov
2010-06-09 22:29:31 +00:00
parent 84ed21e525
commit 5b59859e48
2 changed files with 23 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloatermessagelog.cpp
View File

@@ -369,10 +369,13 @@ std::string LLFloaterMessageLogItem::getString(LLTemplateMessageReader* readerp,
if(summary_mode && (size > 8))
stream << " ... ";
}
delete[] value;
}
break;
}
if(value)
delete[] value;
return stream.str();
}
LLMessageLogFilter::LLMessageLogFilter()

67
indra/newview/skins/silver/xui/en-us/floater_tools.xml
View File

@@ -99,32 +99,27 @@
</combo_item>
<combo_item name="Reference" value="Reference">
Reference
<<<<<<<
=======
</combo_item>
</combo_box>
<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
font="SansSerifSmall" height="15" initial_value="false"
label="Stretch Both Sides" left="143" mouse_opaque="true"
name="checkbox uniform" width="134" />
<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true"
label="Stretch Textures" left_delta="0" mouse_opaque="true"
name="checkbox stretch textures" width="134" />
<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true"
label="Limit drag distance" left_delta="0" mouse_opaque="true"
name="checkbox limit drag distance" width="134" />
<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
<button bottom_delta="-17" follows="left|top" font="SansSerifSmall"
halign="center" valign="center"
height="20" label="Options..." label_selected="Options..." left_delta="20"
mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
>>>>>>>
</combo_item>
</combo_box>
<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
font="SansSerifSmall" height="15" initial_value="false"
label="Stretch Both Sides" left="143" mouse_opaque="true"
name="checkbox uniform" width="134" />
<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true"
label="Stretch Textures" left_delta="0" mouse_opaque="true"
name="checkbox stretch textures" width="134" />
<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true"
label="Limit drag distance" left_delta="0" mouse_opaque="true"
name="checkbox limit drag distance" width="134" />
<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
<button bottom_delta="-17" follows="left|top" font="SansSerifSmall"
halign="center" valign="center"
height="20" label="Options..." label_selected="Options..." left_delta="20"
mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
font="SansSerifSmall" height="16" initial_value="false"
label="Stretch Both Sides" left="143" mouse_opaque="true"
@@ -1028,17 +1023,7 @@
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
mouse_opaque="true" name="color trans" v_pad="0" width="80">
Transparency %
<<<<<<<
</text>
=======
Transparency %
</text>
<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
increment="2" initial_val="0" left="180" max_val="100" min_val="0"
mouse_opaque="true" name="ColorTrans" width="80" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
>>>>>>>
<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
increment="2" initial_val="0" left="180" max_val="90" min_val="0"
mouse_opaque="true" name="ColorTrans" width="80" />
@@ -1205,22 +1190,8 @@
bottom="-288" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
mouse_opaque="true" name="tex offset" v_pad="0" width="160">
<<<<<<<
Offset
</text>
=======
mouse_opaque="true" name="tex offset" v_pad="0" width="160">
Offset
</text>
<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
initial_val="0" label="Horizontal (U)" label_width="90" left="20"
max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
increment="0.05" initial_val="0" label="Vertical (V)" label_width="90"
left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
width="160" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
>>>>>>>
<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
initial_val="0" label="Horizontal (U)" label_width="90" left="20"
max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />