diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
11 files changed, 40 insertions, 52 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_create_landmark.xml b/indra/newview/skins/default/xui/en/floater_create_landmark.xml index dcedaceaeb..bba30626b2 100644 --- a/indra/newview/skins/default/xui/en/floater_create_landmark.xml +++ b/indra/newview/skins/default/xui/en/floater_create_landmark.xml @@ -49,7 +49,7 @@ layout="topleft" name="folder_label" top_pad="10" - value="Landmark location:" + value="Save this landmark in:" width="290" /> <combo_box follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml index 3cc99b28c9..7786ba8a1c 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml @@ -626,23 +626,6 @@ top_delta="16" width="300" /> - <!-- SL-12594, basic shaders always enabled, no fixed-function GL - <check_box - control_name="VertexShaderEnable" - height="16" - initial_value="true" - label="Basic shaders" - layout="topleft" - left="420" - name="BasicShaders" - tool_tip="Disabling this option may prevent some graphics card drivers from crashing" - top_delta="16" - width="300"> - <check_box.commit_callback - function="Pref.VertexShaderEnable" /> - </check_box> - --> - <slider control_name="RenderTerrainDetail" follows="left|top" diff --git a/indra/newview/skins/default/xui/en/floater_url_entry.xml b/indra/newview/skins/default/xui/en/floater_url_entry.xml index 29fb29fabf..2dfc0fd125 100644 --- a/indra/newview/skins/default/xui/en/floater_url_entry.xml +++ b/indra/newview/skins/default/xui/en/floater_url_entry.xml @@ -66,7 +66,7 @@ layout="topleft" left="152" name="loading_label" - visible="true"> + visible="false"> Loading... </text> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index eda9739976..5a35bbf121 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -152,6 +152,14 @@ parameter="category" /> </menu_item_call> <menu_item_call + label="New Outfit" + layout="topleft" + name="New Outfit"> + <menu_item_call.on_click + function="Inventory.DoCreate" + parameter="outfit" /> + </menu_item_call> + <menu_item_call label="New Script" layout="topleft" name="New Script"> diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml index 2ad5cbbe95..1ce0d65b3e 100644 --- a/indra/newview/skins/default/xui/en/menu_land.xml +++ b/indra/newview/skins/default/xui/en/menu_land.xml @@ -18,6 +18,8 @@ <menu_item_call label="Sit Here" name="Sit Here"> + <menu_item_call.on_enable + function="Land.CanSit" /> <menu_item_call.on_click function="Land.Sit" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index c550f69d26..72cce2208f 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2657,6 +2657,18 @@ function="World.EnvPreset" function="Advanced.ForceErrorSoftwareException" /> </menu_item_call> <menu_item_call + label="Force a Crash in a Coroutine" + name="Force a Crash in a Coroutine"> + <menu_item_call.on_click + function="Advanced.ForceErrorCoroutineCrash" /> + </menu_item_call> + <menu_item_call + label="Force a Crash in a Thread" + name="Force a Crash in a Thread"> + <menu_item_call.on_click + function="Advanced.ForceErrorThreadCrash" /> + </menu_item_call> + <menu_item_call label="Force Disconnect Viewer" name="Force Disconnect Viewer"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1dbc15cfd3..b1229d90a3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10056,6 +10056,15 @@ Removal of the object <nolink>'[OBJ_NAME]'</nolink> from the simulat Cannot save your selection because you do not have permission to modify the object <nolink>'[OBJ_NAME]'</nolink>. </notification> + + <notification + icon="alertmodal.tga" + name="NoTransNoSaveToContents" + type="notify"> + <tag>fail</tag> + Cannot save <nolink>'[OBJ_NAME]'</nolink> to object contents because you do not have permission to transfer the object's ownership. + </notification> + <notification icon="alertmodal.tga" name="NoCopyNoSaveSelection" diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index 726e713595..5568ccb792 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -234,32 +234,6 @@ left_pad="32" name="image_right" top="0" /> - <text - follows="left|top" - font="SansSerifLarge" - text_color="White" - height="64" - name="image_caption_left" - left="0" - halign="center" - top="408" - word_wrap="true" - width="400"> - Your first step is Learning Island. Find the exit portal! - </text> - <text - follows="left|top" - font="SansSerifLarge" - text_color="White" - height="64" - name="image_caption_right" - left="432" - halign="center" - top="408" - word_wrap="true" - width="400"> - Then explore Social Island and meet other new residents! - </text> </layout_panel> <layout_panel height="100" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 2dae2649a9..1c9aa1eb83 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -151,7 +151,7 @@ layout="topleft" auto_resize="true" user_resize="true" - min_width="254" + min_width="342" name="favorites_layout_panel" width="342"> <icon @@ -198,8 +198,8 @@ tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!" top="13" valign="bottom" - width="205"> - Your saved locations will appear here. + width="290"> + Places you save to your favorites bar will appear here. </label> <!-- More button actually is a text box. --> <more_button diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index ada980cda1..9023d68ea9 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,7 +35,7 @@ </panel.string> <panel height="18" - left="-458" + left="-398" top="0" width="120" follows="right|top" @@ -75,7 +75,7 @@ </panel> <panel height="18" - left="-458" + left="-398" width="185" top="1" follows="right|top" @@ -142,7 +142,7 @@ left_pad="0" name="TimeText" tool_tip="Current time (Pacific)" - width="145"> + width="85"> 24:00 AM PST </text> <icon diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index f604a16b0b..d115e09d5b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2298,7 +2298,7 @@ For AI Character: Get the closest navigable point to the point provided. <string name="InventoryNoMatchingItems">Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search].</string> <string name="InventoryNoMatchingRecentItems">Didn't find what you're looking for? Try [secondlife:///app/inventory/filters Show filters].</string> <string name="PlacesNoMatchingItems">To add a place to your landmarks, click the star to the right of the location name.</string> - <string name="FavoritesNoMatchingItems">To add a place to your favorites bar, click the star to the right of the location name.</string> + <string name="FavoritesNoMatchingItems">To add a place to your favorites, click the star to the right of the location name, then save the landmark to "Favorites bar".</string> <string name="MarketplaceNoListing">You have no listings yet.</string> <string name="MarketplaceNoMatchingItems">No items found. Check the spelling of your search string and try again.</string> <string name="InventoryNoTexture">You do not have a copy of this texture in your inventory</string> |