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

Add Marketplace option to toolbar and add to world menu

Browse Source 
Also hidden in this commit is the ability to add buttons/menu entries for
your favorite websites to be opened in the in-viewer browser
Just make a button that calls "ShowWebFloater" and passes the URL as param
This commit is contained in:
Lirusaito
2019-08-03 18:37:22 -04:00
parent 01b4f52fb0
commit bcf301ce6a
8 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
indra/newview/skins/default/textures/icn_toolbar_marketplace.tga Normal file
View File

Binary file not shown.

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

@@ -82,7 +82,8 @@
<check_box bottom_delta="-20" label="Favorites" name="favs_btn" follows="left|right" control_name="ToolbarVisibleInventoryFavs"/>
<check_box bottom_delta="-20" label="Received Items" name="received_items_btn" follows="left|right" control_name="ToolbarVisibleInventoryReceivedItems"/>
<check_box bottom_delta="-20" label="Marketplace Listings" name="marketplace_listings_btn" follows="left|right" control_name="ToolbarVisibleMarketplaceListings"/>
<check_box bottom="-38" label="Preferences" name="preferences_btn" follows="left|right" control_name="ToolbarVisiblePreferences" left_delta="160"/>
<check_box bottom="-38" label="Marketplace" name="marketplace_btn" follows="left|right" control_name="ToolbarVisibleMarketplace" left_delta="160"/>
<check_box bottom_delta="-20" label="Preferences" name="preferences_btn" follows="left|right" control_name="ToolbarVisiblePreferences"/>
<check_box bottom_delta="-20" label="Joystick Config" name="joystick_btn" follows="left|right" control_name="ToolbarVisibleJoystick"/>
<check_box bottom_delta="-20" label="Autoreplace" name="auto_replace_btn" follows="left|right" control_name="ToolbarVisibleAutoReplace"/>
<check_box bottom_delta="-20" label="Display Name" name="display_name_btn" follows="left|right" control_name="ToolbarVisibleDisplayName"/>

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

@@ -605,6 +605,9 @@
<on_click function="PromptShowURL" name="ManageMyAccount_url"
userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
</menu_item_call>
<menu_item_call label="Marketplace" name="Marketplace">
<on_click function="ShowWebFloater" userdata="marketplace"/>
</menu_item_call>
<menu_item_check
label="Marketplace Listings..."
name="MarketplaceListings">

7
indra/newview/skins/default/xui/en-us/panel_toolbar.xml
View File

@@ -152,7 +152,7 @@
</layout_panel>
<layout_panel name="panelweb" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleWeb">
<button sound_flags="0" bottom="0" height="24" label="Web Browser" name="web_browser_btn" image_overlay="icn_toolbar_web.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
<button.commit_callback function="ShowFloater" parameter="web"/>
<button.commit_callback function="ShowWebFloater" parameter="dict web"/>
</button>
</layout_panel>
<layout_panel name="panelao" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAO">
@@ -417,6 +417,11 @@
<button.commit_callback function="ShowFloater" parameter="marketplace_listings"/>
</button>
</layout_panel>
<layout_panel name="panelmarketplace" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleMarketplace">
<button sound_flags="0" bottom="0" height="24" label="Marketplace" name="marketplace_btn" image_overlay="icn_toolbar_marketplace.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
<button.commit_callback function="ShowWebFloater" parameter="marketplace"/>
</button>
</layout_panel>
<layout_panel name="panelpreferences" height="24" width="50" user_resize="false" visibility_control="ToolbarVisiblePreferences">
<button sound_flags="0" bottom="0" height="24" label="Preferences" name="preferences_btn" tool_tip="Ctrl-P" image_overlay="icn_toolbar_preferences.tga" image_overlay_alignment="left" image_selected="toolbar_btn_selected.tga" image_unselected="toolbar_btn_enabled.tga" image_disabled="toolbar_btn_disabled.tga" scale_image="true" width="50" follows="left|right">
<button.commit_callback function="ShowFloater" parameter="preferences"/>