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

Merge git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/CMakeLists.txt
	indra/newview/app_settings/settings.xml
This commit is contained in:
Siana Gearz
2011-05-01 22:55:18 +02:00
parent a8f4b3ed4a 26c40255aa
commit 38849c1328
83 changed files with 39297 additions and 39235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/skins/default/xui/en-us/floater_clothing.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="435" min_height="200" min_width="325" name="clothing"
rect_control="FloaterClothingRect" title="Clothing" width="325">
<scroll_list bottom="-395" draw_border="true" draw_heading="true"
follows="top|left|bottom|right" height="370" left="15" multi_select="false"
name="clothing_list" width="295">
<column label="" name="icon" width="16" />
<column label="Name" name="name" width="250" />
<column name="sort" width="-1" />
</scroll_list>
<button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off"
left="-200" name="take_off_btn" width="80" />
<button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100"
name="wear_btn" width="80" />
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
height="435" min_height="200" min_width="325" name="clothing"
rect_control="FloaterClothingRect" title="Clothing" width="325">
<scroll_list bottom="-395" draw_border="true" draw_heading="true"
follows="top|left|bottom|right" height="370" left="15" multi_select="false"
name="clothing_list" width="295">
<column label="" name="icon" width="16" />
<column label="Name" name="name" width="250" />
<column name="sort" width="-1" />
</scroll_list>
<button bottom_delta="-30" follows="bottom|right" height="20" label="Take Off"
left="-200" name="take_off_btn" width="80" />
<button bottom_delta="0" follows="bottom|right" height="20" label="Wear" left="-100"
name="wear_btn" width="80" />
</floater>

32
indra/newview/skins/default/xui/en-us/floater_inventory_backup_settings.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
width="200" height="300" name="inventory_backup_settings" title="Download Options">
<check_box bottom_delta="-50" follows="left|top" left="10" name="chk_textures" label="Textures" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_sounds" label="Sounds" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_callingcards" label="Calling Cards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_landmarks" label="Landmarks" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_scripts" label="Scripts" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_wearables" label="Wearables" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_objects" label="Objects" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_notecards" label="Notecards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_animations" label="Animations" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_gestures" label="Gestures" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button bottom="10" follows="bottom|left" height="20" label="Next >>"
left="110" width="80" name="next_btn" />
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false"
width="200" height="300" name="inventory_backup_settings" title="Download Options">
<check_box bottom_delta="-50" follows="left|top" left="10" name="chk_textures" label="Textures" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_sounds" label="Sounds" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_callingcards" label="Calling Cards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_landmarks" label="Landmarks" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_scripts" label="Scripts" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_wearables" label="Wearables" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_objects" label="Objects" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_notecards" label="Notecards" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_animations" label="Animations" />
<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_gestures" label="Gestures" />
<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
<button bottom="10" follows="bottom|left" height="20" label="Next >>"
left="110" width="80" name="next_btn" />
</floater>

28
indra/newview/skins/default/xui/en-us/floater_preview_embedded_texture.xml
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="201" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="105"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="201" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<button bottom="-325" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Copy To Inventory" left="105"
mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>

58
indra/newview/skins/default/xui/en-us/floater_preview_texture_keep_discard.xml
View File

@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="176" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="194" spell_check="true" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="331" left="176" min_height="120"
min_width="300" mouse_opaque="true" name="preview_texture" width="300">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerif" h_pad="0" halign="left" height="19" left="13"
mouse_opaque="true" name="desc txt" v_pad="0" width="80">
Description:
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
enabled="true" follows="left|top|right" font="SansSerif"
handle_edit_keys_directly="false" height="19" left="93" max_length="127"
mouse_opaque="true" name="desc" select_all_on_focus_received="false"
select_on_focus="false" width="194" spell_check="true" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Keep" label_selected="Keep" left="9"
mouse_opaque="true" name="Keep" scale_image="true" width="100" />
<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="114" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
mouse_opaque="true" name="dimensions" v_pad="0" width="163">
Dimensions: [WIDTH] x [HEIGHT]
</text>
</floater>

13888
indra/newview/skins/default/xui/en-us/notifications.xml
View File

File diff suppressed because it is too large Load Diff

120
indra/newview/skins/default/xui/en-us/panel_land_covenant.xml
View File

@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" follows="top|left" height="220" left="0"
name="Covenant" title="Covenant" width="480">
<text bottom_delta="-5" follows="left|top"
font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
width="250" />
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="region_name_lbl" width="100">
Region:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="region_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_name_lbl" width="100">
Estate:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_owner_lbl" width="100">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="resellable_clause"
width="300">
Purchased land in this region may or may not be resold.
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="changeable_clause"
width="375">
Purchased land in this region may or may not be joined or subdivided.
</text>
<text_editor bottom_delta="-200" enabled="false"
follows="left|top" font="SansSerifSmall" height="200" left="15"
max_length="65535" name="covenant_editor"
width="425" word_wrap="true" />
<string name="can_resell">
Purchased land in this region may be resold.
</string>
<string name="can_not_resell">
Purchased land in this region may not be resold.
</string>
<string name="can_change">
Purchased land in this region may be joined or subdivided.
</string>
<string name="can_not_change">
Purchased land in this region may not be joined or subdivided.
</string>
</panel>
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" bottom="0" follows="top|left" height="220" left="0"
name="Covenant" title="Covenant" width="480">
<text bottom_delta="-5" follows="left|top"
font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
width="250" />
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="region_name_lbl" width="100">
Region:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="region_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_name_lbl" width="100">
Estate:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_name_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
left="10" name="estate_owner_lbl" width="100">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
width="150">
(unknown)
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="resellable_clause"
width="300">
Purchased land in this region may or may not be resold.
</text>
<text bottom_delta="-20" follows="left|top"
font="SansSerif" height="20" left="60" name="changeable_clause"
width="375">
Purchased land in this region may or may not be joined or subdivided.
</text>
<text_editor bottom_delta="-200" enabled="false"
follows="left|top" font="SansSerifSmall" height="200" left="15"
max_length="65535" name="covenant_editor"
width="425" word_wrap="true" />
<string name="can_resell">
Purchased land in this region may be resold.
</string>
<string name="can_not_resell">
Purchased land in this region may not be resold.
</string>
<string name="can_change">
Purchased land in this region may be joined or subdivided.
</string>
<string name="can_not_change">
Purchased land in this region may not be joined or subdivided.
</string>
</panel>