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

Add the option to have a toolbar button for joystick configuration

Browse Source
This commit is contained in:
Inusaito Sayori
2014-07-10 23:42:43 -04:00
parent 5c077d7037
commit c4c206076a
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llmenucommands.cpp
View File

@@ -69,6 +69,7 @@
#include "llfloaterhud.h"
#include "llfloaterinspect.h"
#include "llfloaterinventory.h"
#include "llfloaterjoystick.h"
#include "llfloaterlagmeter.h"
#include "llfloaterland.h"
#include "llfloaterlandholdings.h"
@@ -228,6 +229,7 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
registerFloater<LLFloaterMyFriends> ("groups", 1);
registerFloater<CommWrapper> ("im");
registerFloater<LLFloaterInspect> ("inspect");
registerFloater<LLFloaterJoystick> ("joystick");
registerFloater<LLFloaterLagMeter> ("lag meter");
registerFloater<SLFloaterMediaFilter> ("media filter");
registerFloater<LLFloaterMap> ("mini map");

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

Binary file not shown.

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

@@ -80,6 +80,7 @@
<check_box bottom="-38" label="Favorites" name="favs_btn" follows="left|right" control_name="ToolbarVisibleInventoryFavs" left_delta="160"/>
<check_box bottom_delta="-20" label="Outbox" name="outbox_btn" follows="left|right" control_name="ToolbarVisibleOutbox"/>
<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"/>
<check_box bottom_delta="-20" label="Floater Test" name="floater_test_btn" follows="left|right" control_name="ToolbarVisibleTest"/>

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

@@ -404,6 +404,11 @@
<button.commit_callback function="ShowFloater" parameter="preferences"/>
</button>
</layout_panel>
<layout_panel name="paneljoystick" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleJoystick">
<button bottom="0" height="24" label="Joystick" name="joystick_btn" image_overlay="icn_toolbar_joystick.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="joystick"/>
</button>
</layout_panel>
<layout_panel name="panelautoreplace" height="24" width="50" user_resize="false" visibility_control="ToolbarVisibleAutoReplace">
<button bottom="0" height="24" label="Autoreplace" name="auto_replace_btn" image_overlay="icn_toolbar_auto_replace.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="autoreplace"/>