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

Merge with siana/future

Browse Source
This commit is contained in:
Shyotl
2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml
View File

@@ -12,34 +12,34 @@
>
<button bottom="-45" left="-160" font="SansSerif" halign="center" height="20" label="Dump IDs to Console"
label_selected="Dump" mouse_opaque="true" name="Dump" scale_image="TRUE" width="150" />
<!-- The names of the following must match the definitions in llvoavatardefines.cpp -->
<texture_picker bottom="-130" height="111" label="Hair Baked" left="4" name="hair-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Hair" left_delta="99" name="hair" width="96" />
<texture_picker bottom_delta="0" height="111" label="Hair" left_delta="99" name="hair_grain" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes Baked" left_delta="99" name="eyes-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes" left_delta="99" name="iris" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes" left_delta="99" name="eyes_iris" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Head Baked" left="4" name="head-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Makeup" left_delta="99" name="head bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Makeup" left_delta="99" name="head_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Head Tattoo" left_delta="99" name="head_tattoo" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Tattoo" left_delta="99" name="upper_tattoo" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Tattoo" left_delta="99" name="lower_tattoo" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Upper Baked" left="4" name="upper-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Skin" left_delta="99" name="upper bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Undershirt" left_delta="99" name="undershirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shirt" left_delta="99" name="shirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Jacket" left_delta="99" name="upper jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Gloves" left_delta="99" name="gloves" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Skin" left_delta="99" name="upper_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Undershirt" left_delta="99" name="upper_undershirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shirt" left_delta="99" name="upper_shirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Jacket" left_delta="99" name="upper_jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Gloves" left_delta="99" name="upper_gloves" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Lower Baked" left="4" name="lower-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Skin" left_delta="99" name="lower bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Underpants" left_delta="99" name="underpants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Pants" left_delta="99" name="pants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Jacket" left_delta="99" name="lower jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Socks" left_delta="99" name="socks" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Skin" left_delta="99" name="lower_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Underpants" left_delta="99" name="lower_underpants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Pants" left_delta="99" name="lower_pants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Jacket" left_delta="99" name="lower_jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Socks" left_delta="99" name="lower_socks" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Skirt Baked" left="4" name="skirt-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Skirt" left_delta="99" name="skirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shoes" left_delta="99" name="shoes" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shoes" left_delta="99" name="lower_shoes" width="96" />
</floater>

14
indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-400" can_close="true" can_drag_on_left="false"
can_minimize="true" can_resize="false" height="224"
left="50" min_height="200" min_width="600" mouse_opaque="true"
can_minimize="true" can_resize="false" height="244"
left="50" min_height="244" min_width="500" mouse_opaque="true"
name="Hardware Settings Floater" title="Hardware Settings" width="500">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
@@ -94,6 +94,16 @@
follows="left|top" height="16" increment="0.1"
initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10"
max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="40"
left="10" mouse_opaque="true" name="note" v_pad="0"
width="480">
Note: the Gamma and Fog Distance Ratio settings are unavailable (since useless) when the
Atmospheric Shaders are enabled.
</text>
<button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="OK" label_selected="OK"
left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />

9
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -5,8 +5,11 @@
title="Inventory" width="467">
<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<button left="10" bottom_delta="-24" height="20" width="25" follows="left|top" halign="center"
label="--" name="collapse_btn" mouse_opaque="true" font="SansSerif"
tool_tip="Collapse All" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left_delta="35" bottom_delta="0" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
@@ -21,7 +24,7 @@
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left_delta="60" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>

47
indra/newview/skins/default/xui/en-us/floater_preview_notecard.xml
View File

@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" follows="left|top" height="361" left="273"
min_height="243" min_width="234" mouse_opaque="true"
can_resize="true" enabled="true" follows="left|top" height="377" left="273"
min_height="259" min_width="234" mouse_opaque="true"
name="preview notecard" title="Note:" width="400">
<button bottom="-352" enabled="false" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Save" label_selected="Save" left="9"
mouse_opaque="false" name="Save" scale_image="true" width="100" />
<button bottom="-352" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Get Items" label_selected="Get Items" left_delta="110"
<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Get Items" label_selected="Get Items" left_delta="120"
mouse_opaque="false" name="Get Items" scale_image="true" width="100" />
<!--<check_box follows="left|bottom" bottom_delta="0" left_delta="110" name="https_chk" label="Saves via HTTPS" />-->
<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
@@ -24,12 +21,44 @@
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="294" spell_check="true" />
<text_editor type="string" length="1" bottom="-327" embedded_items="true" enabled="true"
follows="left|top|right|bottom" font="SansSerif" height="281"
<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
tear_off="false" width="220">
<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
mouse_opaque="true" name="Undo" width="139" />
<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
mouse_opaque="true" name="Redo" width="139" />
<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator1" width="139" />
<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
mouse_opaque="true" name="Cut" width="139" />
<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
mouse_opaque="true" name="Copy" width="139" />
<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
mouse_opaque="true" name="Paste" width="139" />
<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="139" />
<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
mouse_opaque="true" name="Select All" width="139" />
<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
mouse_opaque="true" name="Deselect" width="139" />
<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator3" width="139" />
<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
</menu>
</menu_bar>
<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
follows="left|top|right|bottom" font="SansSerif" height="285"
ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
Loading...
</text_editor>
<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Save" label_selected="Save" left="9"
mouse_opaque="false" name="Save" scale_image="true" width="100" />
<string name="no_object">
Unable to find object containing this note.
</string>

80
indra/newview/skins/default/xui/en-us/floater_preview_notecard_keep_discard.xml
View File

@@ -1,35 +1,71 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-484" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" height="400" left="138" min_height="243"
min_width="234" mouse_opaque="true" name="preview_notecard" width="400">
<text_editor type="string" length="1" bottom="-366"
embedded_items="true" enabled="true" follows="left|top|right|bottom"
font="SansSerif" height="320" ignore_tab="false" left="4"
max_length="65536" mouse_opaque="true" name="Notecard Editor" width="392"
word_wrap="true">
Loading...
</text_editor>
<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="true" enabled="true" follows="left|top" height="377" left="273"
min_height="259" min_width="350" mouse_opaque="true"
name="preview notecard" title="Note:" width="400">
<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
width="16" />
<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>
<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
width="16" />
<button bottom="-391" 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="-391" 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" />
<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="294" spell_check="true" />
<string name="no_object">Unable to find object containing this note.:</string>
<string name="not_allowed">You are not allowed to view this note.</string>
<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
tear_off="false" width="220">
<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
mouse_opaque="true" name="Undo" width="139" />
<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
mouse_opaque="true" name="Redo" width="139" />
<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator1" width="139" />
<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
mouse_opaque="true" name="Cut" width="139" />
<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
mouse_opaque="true" name="Copy" width="139" />
<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
mouse_opaque="true" name="Paste" width="139" />
<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator2" width="139" />
<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
mouse_opaque="true" name="Select All" width="139" />
<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
mouse_opaque="true" name="Deselect" width="139" />
<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator3" width="139" />
<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
</menu>
</menu_bar>
<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
follows="left|top|right|bottom" font="SansSerif" height="285"
ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
name="Notecard Editor" width="392" word_wrap="true">
Loading...
</text_editor>
<button bottom="-370" 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="-370" enabled="false" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Save" label_selected="Save" left="114"
mouse_opaque="false" name="Save" scale_image="true" width="100" />
<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
halign="center" height="20" label="Discard" label_selected="Discard"
left="219" mouse_opaque="true" name="Discard" scale_image="true"
width="100" />
<string name="no_object">
Unable to find object containing this note.
</string>
<string name="not_allowed">
You are not allowed to view this note.
</string>
</floater>

40
indra/newview/skins/default/xui/en-us/floater_search_replace.xml Normal file
View File

@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
can_resize="false" can_tear_off="true" enabled="true" height="120"
left="223" min_height="100" min_width="100" mouse_opaque="true"
name="script search" title="Search / Replace" width="300">
<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Case Insensitive" left="55"
mouse_opaque="true" name="case_text" radio_style="false" width="240" />
<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
label="Search" label_selected="Search" left="10" mouse_opaque="true"
name="search_btn" scale_image="true" width="90" />
<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
name="replace_btn" scale_image="true" width="90" />
<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
label="Replace All" label_selected="Replace All" left="200"
mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
mouse_opaque="true" name="search_label" v_pad="0" width="45">
Search
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
mouse_opaque="true" name="replace_label" v_pad="0" width="45">
Replace
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
enabled="true" follows="left|top" font="SansSerifSmall"
handle_edit_keys_directly="false" height="16" left="55" max_length="254"
mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
select_on_focus="false" width="240" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
enabled="true" follows="left|top" font="SansSerifSmall"
handle_edit_keys_directly="false" height="16" left="55" max_length="254"
mouse_opaque="true" name="replace_text"
select_all_on_focus_received="false" select_on_focus="false" width="240" />
</floater>

5
indra/newview/skins/default/xui/en-us/menu_pie_self.xml
View File

@@ -54,6 +54,11 @@
<on_click function="Edit.TakeOff" userdata="tattoo" />
<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
</menu_item_call>
<menu_item_call bottom="-165" enabled="false" height="19" label="Alpha" left="0"
mouse_opaque="true" name="Self Alpha" width="118">
<on_click function="Edit.TakeOff" userdata="alpha" />
<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
</menu_item_call>
<menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
mouse_opaque="true" name="Self Underpants" width="118">
<on_click function="Edit.TakeOff" userdata="underpants" />

22
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -196,11 +196,25 @@
<on_click function="Edit.TakeOff" userdata="skirt" />
<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
</menu_item_call>
<menu_item_call bottom="-200" enabled="false" height="19" label="Physics" left="0"
<menu_item_call bottom="-185" enabled="false" height="19" label="Tattoo" left="0"
mouse_opaque="true" name="Tattoo" width="118">
<on_click function="Edit.TakeOff" userdata="tattoo" />
<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
</menu_item_call>
<menu_item_separator bottom="-187" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator51" width="153" />
<menu_item_call bottom="-190" enabled="false" height="19" label="Alpha" left="0"
mouse_opaque="true" name="Alpha" width="118">
<on_click function="Edit.TakeOff" userdata="alpha" />
<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
</menu_item_call>
<menu_item_call bottom="-200" enabled="false" height="19" label="Physics" left="0"
mouse_opaque="true" name="Physics" width="118">
<on_click function="Edit.TakeOff" userdata="physics" />
<on_enable function="Edit.EnableTakeOff" userdata="physics" />
</menu_item_call>
<on_click function="Edit.TakeOff" userdata="physics" />
<on_enable function="Edit.EnableTakeOff" userdata="physics" />
</menu_item_call>
<menu_item_separator bottom="-195" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator51" width="153" />
<menu_item_call bottom="-119" enabled="true" height="19" label="All Clothes" left="0"
mouse_opaque="true" name="All Clothes" width="118">
<on_click function="Edit.TakeOff" userdata="all" />

1
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -147,7 +147,6 @@ Hover your mouse over the options for more help.
</text>
<combo_box length="120" width="175" bottom_delta="-25" follows="left|top" height="20" left_delta="0" name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active." />
</panel>
</panel>
<string name="incomplete_member_data_str">
Retrieving member data

5
indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
View File

@@ -38,7 +38,10 @@
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
scale_image="true" tool_tip="Click here to stand up." width="102" />
</layout_panel>
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
</layout_panel>
<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
min_height="24" mouse_opaque="false" name="chat_bar"

19
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
View File

@@ -7,7 +7,7 @@
<check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false"
label="Run viewer in a window" left="10" mouse_opaque="true"
name="windowed mode" radio_style="false" width="100" />
name="windowed mode" radio_style="false" width="120" />
<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom="-43"
embedded_items="false" enabled="false" follows="left|top"
font="SansSerifSmall" height="20" hide_border="true"
@@ -163,8 +163,8 @@
follows="left|top" font="SansSerifSmall" height="16"
initial_value="true" label="Custom" left="385" mouse_opaque="true"
name="CustomSettings" radio_style="false" width="256" />
<view_border bevel_style="none" border_thickness="1" bottom="-405" follows="top|left"
height="290" left="5" name="GraphicsBorder" width="485" />
<view_border bevel_style="none" border_thickness="1" bottom="-395" follows="top|left"
height="280" left="5" name="GraphicsBorder" width="485" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-130" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
@@ -274,9 +274,14 @@
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Avatar Impostors" left_delta="0" mouse_opaque="true"
name="AvatarImpostors" radio_style="false" width="256" />
<check_box bottom_delta="-17" control_name="RenderAvatarVP" enabled="true"
<slider bottom_delta="-17" can_edit_text="false" control_name="RenderAvatarMaxVisible"
decimal_digits="0" enabled="true" follows="left|top" height="16"
increment="1" initial_val="35" label="Max non-impostors"
label_width="100" left_delta="8" max_val="50" min_val="1" mouse_opaque="true"
name="AvatarMaxVisible" show_text="true" width="195" />
<check_box bottom_delta="-20" control_name="RenderAvatarVP" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Hardware Skinning" left_delta="0" mouse_opaque="true"
label="Hardware Skinning" left="10" mouse_opaque="true"
name="AvatarVertexProgram" radio_style="false" width="256" />
<check_box bottom_delta="-17" control_name="RenderAvatarCloth" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
@@ -412,7 +417,7 @@
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12"
left="210" mouse_opaque="true" name="LightingDetailText" v_pad="0"
left="215" mouse_opaque="true" name="LightingDetailText" v_pad="0"
width="128">
Lighting Detail:
</text>
@@ -430,7 +435,7 @@
</radio_group>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-352" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="360"
font="SansSerifSmall" h_pad="0" halign="left" height="12" left="370"
mouse_opaque="true" name="TerrainDetailText" v_pad="0" width="128">
Terrain Detail:
</text>

2
indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
View File

@@ -29,7 +29,7 @@
</text>
<slider bottom_delta="-25" can_edit_text="true"
decimal_digits="0" enabled="true" follows="left|top" height="15"
increment="64" initial_val="1024" left_delta="0" max_val="9984" min_val="64"
increment="64" initial_val="1024" left_delta="0" max_val="2048" min_val="64"
mouse_opaque="true" name="cache_size" show_text="true" width="180" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="4" drop_shadow_visible="true" enabled="true"

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

@@ -1739,6 +1739,46 @@ llSetObjectPermMask( integer mask, integer value )
Sets the given permission mask to the new value on the root object the task is attached to.
(Requires god mode)
</string>
<string name="LSLTipText_llSetMemoryLimit">
integer llSetMemoryLimit( integer limit )
Request ''limit'' bytes to be reserved for this script.
</string>
<string name="LSLTipText_llSetLinkMedia">
integer llSetLinkMedia( integer link, integer face, list params )
Set the media params for a particular face on the linked prim(s) without a delay.
</string>
<string name="LSLTipText_llGetLinkMedia">
list llGetLinkMedia( integer link, integer face, list params )
Returns a list with the media params for a particular face on a linked prim, given the desired list of named params.
</string>
<string name="LSLTipText_llClearLinkMedia">
integer llClearLinkMedia( integer link, integer face )
Clears the media and all params from the given face on the linked prim(s).
</string>
<string name="LSLTipText_llSetLinkCamera">
llSetLinkCamera( integer link, vector eye, vector at )
Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
</string>
<string name="LSLTipText_llSetContentType">
llSetContentType( key request_id, integer content_type )
Set the Internet media type of an LSL HTTP server response.
</string>
<string name="LSLTipText_llLinkSitTarget">
llLinkSitTarget( integer link, vector offset, rotation rot );
Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
</string>
<string name="LSLTipText_llAvatarOnLinkSitTarget">
key llAvatarOnLinkSitTarget( integer link )
Returns a key that is the UUID of the user seated on the prim.
</string>
<!-- No info on these functions yet....
<string name="LSLTipText_llSetVelocity">
</string>
<string name="LSLTipText_llSetRotationalVelocity">
</string>
-->
<!-- Addition of OSSL commands for use in OpenSimulator based regions, including Aurora -->
<string name="LSLTipText_osSetRegionWaterHeight">
@@ -2244,4 +2284,62 @@ list lsGetWindlightScene(list rules)
Get the current WindLight settings.
(Reguires LightShare)
</string>
<!-- New OSSL Functions as of 8-10-2011 -->
<string name="LSLTipText_osNpcSaveAppearance">
key osNpcSaveAppearance(key npc, string notecardName)
Saves the NPC's appearance to a notecard.
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcLoadAppearance">
osNpcLoadAppearance(key npc, string notecardName)
Loads the NPC's appearance from a notecard with appearance data.
Notecards can also be loaded by UUID.
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcMoveToTarget">
osNpcMoveToTarget(key npc, vector position, integer options)
Moves the NPC to a target at a given vector, using options to walk or to fly there.
(OpenSim only.)
</string>
<string name="LSLTipText_osOwnerSaveAppearance">
key osOwnerSaveAppearance(string notecardName)
Saves the owner's appearance to a notecard inside the prim that holds the script.
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcGetRot">
rotation osNpcGetRot(key npc)
Retrieves the rotation of an NPC
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcSetRot">
osNpcSetRot(key npc, rotation rot)
Sets an NPC's rotation.
(OpenSim only.)
</string>
<string name="LSLTipText_osAgentSaveAppearance">
key osOwnerSaveAppearance(key avatarId, string notecardName)
Saves an avatar's appearance to a notecard inside the prim that holds the script.
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcGetPos">
vector osNpcGetPos(key npc)
Retrieves the vector of an NPC's position within a region.
(OpenSim only.)
</string>
<string name="LSLTipText_osNpcStopMoveToTarget">
osNpcStopMoveToTarget(key npc)
Makes an NPC stop moving to a target.
(OpenSim only.)
</string>
<string name="LSLTipText_osGetWindParam">
float osGetWindParam(string plugin, string param)
Gets the value of param property for plugin module.
(OpenSim only.)
</string>
<string name="LSLTipText_osSetWindParam">
osSetWindParam(string plugin, string param, float value)
Sets value of param property for plugin module.
(OpenSim only.)
</string>
</strings>