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

Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear

Browse Source
This commit is contained in:
Lirusaito
2012-05-30 21:16:27 -04:00
parent c6120cd283 b15f2d1a56
commit 20f138b31f
16 changed files with 1044 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/en-us/floater_customize.xml
View File

@@ -1398,19 +1398,19 @@ scratch and wear it.
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-410" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16"
left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
left="8" mouse_opaque="false" name="AvatarHeightText" v_pad="0" width="140">
Avatar Height:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16"
left="8" mouse_opaque="true" name="HeightTextM" v_pad="0" width="140">
left="8" mouse_opaque="false" name="HeightTextM" v_pad="0" width="140">
(metric)
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="16"
left="8" mouse_opaque="true" name="HeightTextI" v_pad="0" width="140">
left="8" mouse_opaque="false" name="HeightTextI" v_pad="0" width="140">
(imperial)
</text>
<button name="Import" label="Import"

3
indra/newview/skins/default/xui/en-us/strings.xml
View File

@@ -16,6 +16,9 @@
<string name="TeleportLureMaturity">
[NAME]'s teleport lure is to [DESTINATION]
</string>
<string name="AvatarIdle">
Idle [MINUTES]min
</string>
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string>