From dc9cb07a818a0a77f872ccf1be5952dbf1d872fb Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Wed, 16 Apr 2014 19:03:07 -0400
Subject: [PATCH] [Floater Flexibility] Part four: Added a floater to change
 buttons shown on the toolbar

View->Change toolbar buttons

Reuses the old FloaterUploadRect because I'm allowed to be lazy after creating this large control panel
---
 .../newview/app_settings/settings_ascent.xml  |  2 +-
 .../xui/en-us/floater_toolbar_prefs.xml       | 96 +++++++++++++++++++
 .../skins/default/xui/en-us/menu_viewer.xml   |  3 +
 3 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml

diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index d19529164..1e4a735df 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -1683,7 +1683,7 @@
     <key>ToolbarVisibleToolbarPrefs</key>
     <map>
       <key>Comment</key>
-      <string>Whether or not the button for the floater to change buttons on the toolbar is on the toolbar (Nonfunctional, yet. Poke Liru.)</string>
+      <string>Whether or not the button for the floater to change buttons on the toolbar is on the toolbar</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml b/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
new file mode 100644
index 000000000..d3ac8a2c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/floater_toolbar_prefs.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom_delta="-20" can_close="true" can_minimize="true" can_resize="false" follows="left|right|bottom" height="330" name="floater_toolbar_prefs.xml" width="1024" title="Choose the buttons you want shown on the toolbar" rect_control="FloaterUploadRect">
+  <check_box bottom="-38" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="Chatbar Toggle" left="5" name="chat_btn" follows="left|right" control_name="ToolbarVisibleChatbar"/>
+  <check_box bottom_delta="-20" label="Communicate Flyout" name="communicate_flyout" follows="left|right" control_name="ToolbarVisibleCommunicateIM"/>
+  <check_box bottom_delta="-20" label="Communicate Button" name="communicate_btn" follows="left|right" control_name="ToolbarVisibleCommunicate"/>
+  <check_box control_name="ToolbarVisibleFriends" bottom_delta="-20" label="Friends" name="friends_btn" follows="left|right"/>
+  <check_box bottom_delta="-20" label="Groups" name="groups_btn" follows="left|right" control_name="ToolbarVisibleGroups"/>
+  <check_box bottom_delta="-20" label="Group Titles" name="group_titles_btn" follows="left|right" control_name="ToolbarVisibleGroupTitles"/>
+  <check_box bottom_delta="-20" label="Local Chat" name="chat_history_btn" follows="left|right" control_name="ToolbarVisibleChatHistory"/>
+  <check_box bottom_delta="-20" label="Active Speakers" name="active_speakers_btn" follows="left|right" control_name="ToolbarVisibleActiveSpeakers"/>
+  <check_box bottom_delta="-20" label="Mute List" name="mute_list_btn" follows="left|right" control_name="ToolbarVisibleMuteList"/>
+  <check_box bottom_delta="-20" label="Asset Blacklist" name="black_list_btn" follows="left|right" control_name="ToolbarVisibleAssetBlacklist"/>
+  <check_box bottom_delta="-20" label="Voice FX" name="voice_effects_btn" follows="left|right" control_name="ToolbarVisibleVoiceEffect"/>
+  <check_box bottom_delta="-20" label="Gestures" name="gestures_btn" follows="left|right" control_name="ToolbarVisibleGestures"/>
+  <check_box bottom_delta="-20" label="Beacons" name="beacons_btn" follows="left|right" control_name="ToolbarVisibleBeacons"/>
+  <check_box bottom_delta="-20" label="Radar" name="radar_list_btn" follows="left|right" control_name="ToolbarVisibleRadar"/>
+  <check_box bottom_delta="-20" label="Camera Controls" name="camera_controls_btn" follows="left|right" control_name="ToolbarVisibleCameraControls"/>
+  <check_box bottom="-38" label="Movement Controls" name="movement_controls_btn" follows="left|right" control_name="ToolbarVisibleMovementControls" left_delta="160"/>
+  <check_box bottom_delta="-20" label="Mouselook" name="look_btn" follows="left|right" control_name="ToolbarVisibleMouselook"/>
+  <check_box bottom_delta="-20" label="Fly" name="fly_btn" follows="left|right" control_name="ToolbarVisibleFly"/>
+  <check_box bottom_delta="-20" label="Sit" name="sit_btn" follows="left|right" control_name="ToolbarVisibleSit"/>
+  <check_box bottom_delta="-20" label="Run" name="run_btn" follows="left|right" control_name="ToolbarVisibleAlwaysRun"/>
+  <check_box bottom_delta="-20" label="Velocity" name="velocity_btn" follows="left|right" control_name="ToolbarVisibleVelocity"/>
+  <check_box bottom_delta="-20" label="Bumps" name="bumps_btn" follows="left|right" control_name="ToolbarVisibleMeanEvents"/>
+  <check_box bottom_delta="-20" label="Stream Display" name="media_ticker_btn" follows="left|right" control_name="ToolbarVisibleMediaTicker"/>
+  <check_box bottom_delta="-20" label="Media Filter" name="media_filter_btn" follows="left|right" control_name="ToolbarVisibleMediaFilter"/>
+  <check_box bottom_delta="-20" label="Snapshot" name="snapshot_btn" follows="left|right" control_name="ToolbarVisibleSnapshot"/>
+  <check_box bottom_delta="-20" label="Appearance" name="appearance_btn" follows="left|right" control_name="ToolbarVisibleAppearance"/>
+  <check_box bottom_delta="-20" label="Search" name="directory_btn" follows="left|right" control_name="ToolbarVisibleSearch"/>
+  <check_box bottom_delta="-20" label="Web Browser" name="web_browser_btn" follows="left|right" control_name="ToolbarVisibleWeb"/>
+  <check_box bottom_delta="-20" label="AO Settings" name="ao_btn" follows="left|right" control_name="ToolbarVisibleAO"/>
+  <check_box bottom_delta="-20" label="Debug Settings" name="debug_settings_btn" follows="left|right" control_name="ToolbarVisibleDebugSettings"/>
+  <check_box bottom="-38" label="Debug Avatar" name="debug_avatar_btn" follows="left|right" control_name="ToolbarVisibleDebugAvatar" left_delta="160"/>
+  <check_box bottom_delta="-20" label="Anims Explorer" name="anims_explorer_btn" follows="left|right" control_name="ToolbarVisibleAnimsExplorer"/>
+  <check_box bottom_delta="-20" label="Sound Explorer" name="sound_explorer_btn" follows="left|right" control_name="ToolbarVisibleSoundExplorer"/>
+  <check_box bottom_delta="-20" label="Area Search" name="areasearch_btn" follows="left|right" control_name="ToolbarVisibleAreaSearch"/>
+  <check_box bottom_delta="-20" label="Inspect" name="inspect_btn" follows="left|right" control_name="ToolbarVisibleInspect"/>
+  <check_box bottom_delta="-20" label="Characters" name="pathing_characters_btn" follows="left|right" control_name="ToolbarVisiblePathfindingCharacters"/>
+  <check_box bottom_delta="-20" label="Linksets" name="pathing_linksets_btn" follows="left|right" control_name="ToolbarVisiblePathfindingLinksets"/>
+  <check_box bottom_delta="-20" label="Build" name="build_btn" follows="left|right" control_name="ToolbarVisibleBuild"/>
+  <check_box bottom_delta="-20" label="Grid Options" name="grid_options_btn" follows="left|right" control_name="ToolbarVisibleGridOptions"/>
+  <check_box bottom_delta="-20" label="Local Textures" name="local_textures_btn" follows="left|right" control_name="ToolbarVisibleLocalAssets"/>
+  <check_box bottom_delta="-20" label="Upload Perms" name="perm_prefs_btn" follows="left|right" control_name="ToolbarVisiblePermPrefs"/>
+  <check_box bottom_delta="-20" label="Script Errors" name="script_errors_btn" follows="left|right" control_name="ToolbarVisibleScriptErrors"/>
+  <check_box bottom_delta="-20" label="Environment Editor" name="env_editor_btn" follows="left|right" control_name="ToolbarVisibleEnvSettings"/>
+  <check_box bottom_delta="-20" label="Day Cycle Editor" name="day_cycle_editor_btn" follows="left|right" control_name="ToolbarVisibleDayCycle"/>
+  <check_box bottom_delta="-20" label="Windlight" name="windlight_btn" follows="left|right" control_name="ToolbarVisibleWindlight"/>
+  <check_box bottom="-38" label="Water Editor" name="water_editor_btn" follows="left|right" control_name="ToolbarVisibleWaterSettings" left_delta="160"/>
+  <check_box bottom_delta="-20" label="Post-Process FX" name="post_process_btn" follows="left|right" control_name="ToolbarVisiblePostProcess"/>
+  <check_box bottom_delta="-20" label="Buy [CURRENCY]" name="buy_currency_btn" follows="left|right" control_name="ToolbarVisibleBuyCurrency"/>
+  <check_box bottom_delta="-20" label="Buy Land" name="buy_land_btn" follows="left|right" control_name="ToolbarVisibleBuyLand"/>
+  <check_box bottom_delta="-20" label="My Land" name="my_land_btn" follows="left|right" control_name="ToolbarVisibleMyLand"/>
+  <check_box bottom_delta="-20" label="About Land" name="about_land_btn" follows="left|right" control_name="ToolbarVisibleAboutLand"/>
+  <check_box bottom_delta="-20" label="Script Info" name="script_info_btn" follows="left|right" control_name="ToolbarVisibleScriptInfo"/>
+  <check_box bottom_delta="-20" label="Region/Estate" name="about_region_btn" follows="left|right" control_name="ToolbarVisibleAboutRegion"/>
+  <check_box bottom_delta="-20" label="God Tools" name="god_tools_btn" follows="left|right" control_name="ToolbarVisibleGodTools"/>
+  <check_box bottom_delta="-20" label="TP History" name="teleport_history_btn" follows="left|right" control_name="ToolbarVisibleTeleportHistory"/>
+  <check_box bottom_delta="-20" label="Map" name="map_btn" follows="left|right" control_name="ToolbarVisibleWorldMap"/>
+  <check_box bottom_delta="-20" label="Mini-Map" name="minimap_btn" follows="left|right" control_name="ToolbarVisibleMiniMap"/>
+  <!-- [RLVa:LF] -->
+  <check_box bottom_delta="-20" label="RLVa Restrictions" name="rlv_restrictions_btn" follows="left|right" control_name="ToolbarVisibleRLVRestrictions"/>
+  <check_box bottom_delta="-20" label="RLVa Locks" name="rlv_locks_btn" follows="left|right" control_name="ToolbarVisibleRLVLocks"/>
+  <check_box bottom_delta="-20" label="RLVa Strings" name="rlv_strings_btn" follows="left|right" control_name="ToolbarVisibleRLVStrings"/>
+  <!-- [/RLVa:LF] -->
+  <check_box bottom="-38" label="Memory Leak" name="memleak_btn" follows="left|right" control_name="ToolbarVisibleMemLeak" visibility_control="QAMode" left_delta="160"/>
+  <check_box bottom_delta="-20" label="Message Log" name="message_log_btn" follows="left|right" control_name="ToolbarVisibleMessageLog"/>
+  <check_box bottom_delta="-20" label="Statistics" name="stats_btn" follows="left|right" control_name="ToolbarVisibleStatBar"/>
+  <check_box bottom_delta="-20" label="Notifications Console" name="notifications_console_btn" follows="left|right" control_name="ToolbarVisibleNotificationsConsole"/>
+  <check_box bottom_delta="-20" label="Debug Console" name="debug_console_btn" follows="left|right" control_name="ToolbarVisibleDebugConsole"/>
+  <check_box bottom_delta="-20" label="Region Console" name="region_console_btn" follows="left|right" control_name="ToolbarVisibleRegionDebugConsole"/>
+  <check_box bottom_delta="-20" label="Fast Timers" name="fast_timers_btn" follows="left|right" control_name="ToolbarVisibleFastTimers"/>
+  <check_box bottom_delta="-20" label="Frame Console" name="frame_console_btn" follows="left|right" control_name="ToolbarVisibleFrameConsole"/>
+  <check_box bottom_delta="-20" label="HTTP Console" name="http_console_btn" follows="left|right" control_name="ToolbarVisibleHTTPConsole"/>
+  <check_box bottom_delta="-20" label="Texture Console" name="texture_console_btn" follows="left|right" control_name="ToolbarVisibleTextureConsole"/>
+  <check_box bottom_delta="-20" label="Texture Category Console" name="texture_category_console_btn" follows="left|right" control_name="ToolbarVisibleTextureCategoryConsole" visibility_control="AuditTexture"/>
+  <check_box bottom_delta="-20" label="Texture Size Console" name="texture_size_console_btn" follows="left|right" control_name="ToolbarVisibleTextureSizeConsole" visibility_control="AuditTexture"/>
+  <check_box bottom_delta="-20" label="Inventory" name="directory_btn" follows="left|right" control_name="ToolbarVisibleInventory"/>
+  <check_box bottom_delta="-20" label="Make Outfit" name="make_outfit_btn" follows="left|right" control_name="ToolbarVisibleOutfit"/>
+  <check_box bottom_delta="-20" label="Outfits" name="outfits_btn" follows="left|right" control_name="ToolbarVisibleInventoryOutfits"/>
+  <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="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"/>
+  <check_box bottom_delta="-20" label="Edit UI" name="edit_ui_btn" follows="left|right" control_name="ToolbarVisibleEditUI"/>
+  <check_box bottom_delta="-20" label="Font Test" name="font_test_btn" follows="left|right" control_name="ToolbarVisibleFontTest"/>
+  <check_box bottom_delta="-20" label="Lag Meter" name="lag_meter_btn" follows="left|right" control_name="ToolbarVisibleLagMeter"/>
+  <check_box bottom_delta="-20" label="Report Abuse" name="abuse_btn" follows="left|right" control_name="ToolbarVisibleComplaintReporter"/>
+  <!-- Singu TODO: Re-implement f1 help.
+  <check_box bottom_delta="-20" label="Help" name="help_btn" follows="left|right" control_name="ToolbarVisibleHelp"/>
+  -->
+  <check_box bottom_delta="-20" label="Tutorial" name="tutorial_btn" follows="left|right" control_name="ToolbarVisibleHelpTutorial"/>
+  <check_box bottom_delta="-20" label="About [SHORT_APP_NAME]" name="about_btn" follows="left|right" control_name="ToolbarVisibleAbout"/>
+  <check_box bottom_delta="-20" label="Change Buttons" name="change_buttons_btn" follows="left|right" control_name="ToolbarVisibleToolbarPrefs"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 78b13ba8b..462427138 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -324,6 +324,9 @@
 			<on_click function="ShowFloater" userdata="toolbar" />
 			<on_check function="FloaterVisible" userdata="toolbar" />
 		</menu_item_check>
+		<menu_item_call label="Change toolbar buttons" name="toolbar_prefs">
+			<on_click function="ShowFloater" userdata="floater_toolbar_prefs.xml"/>
+		</menu_item_call>
 		<menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
 		     mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
              <on_click function="ShowFloater" userdata="chat history"/>