diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 15447e7e83b4419127be0485031fd508b4bfc983..bbac65ef61bbde7ee153106ae7f1858339574524 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3494,7 +3494,7 @@
<key>DoubleClickAutoPilot</key>
<map>
<key>Comment</key>
- <string>Enable double-click auto pilot</string>
+ <string>(Obsolete)Enable double-click auto pilot</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -3505,13 +3505,13 @@
<key>DoubleClickTeleport</key>
<map>
<key>Comment</key>
- <string>Enable double-click to teleport where allowed</string>
+ <string>Enable double-click to teleport where allowed (afects minimap and people panel)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>DoubleClickShowWorldMap</key>
<map>
@@ -15364,7 +15364,7 @@
<key>ClickToWalk</key>
<map>
<key>Comment</key>
- <string>Click in world to walk to location</string>
+ <string>(obsolete)Click in world to walk to location</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 16f2426d1b2a43ce714c3b4260b2521c066ce386..2354be25e93cf827ebadd9aee52f81ddd6fe98ae 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -564,8 +564,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mGotPersonalInfo(false),
mOriginalIMViaEmail(false),
mLanguageChanged(false),
- mAvatarDataInitialized(false),
- mClickActionDirty(false)
+ mAvatarDataInitialized(false)
{
LLConversationLog::instance().addObserver(this);
@@ -587,7 +586,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
mCommitCallbackRegistrar.add("Pref.ResetCache", boost::bind(&LLFloaterPreference::onClickResetCache, this));
mCommitCallbackRegistrar.add("Pref.ClickSkin", boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
mCommitCallbackRegistrar.add("Pref.SelectSkin", boost::bind(&LLFloaterPreference::onSelectSkin, this));
- mCommitCallbackRegistrar.add("Pref.VoiceSetKey", boost::bind(&LLFloaterPreference::onClickSetKey, this));
mCommitCallbackRegistrar.add("Pref.VoiceSetMiddleMouse", boost::bind(&LLFloaterPreference::onClickSetMiddleMouse, this));
mCommitCallbackRegistrar.add("Pref.SetSounds", boost::bind(&LLFloaterPreference::onClickSetSounds, this));
mCommitCallbackRegistrar.add("Pref.ClickEnablePopup", boost::bind(&LLFloaterPreference::onClickEnablePopup, this));
@@ -615,8 +613,6 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
sSkin = gSavedSettings.getString("SkinCurrent");
- mCommitCallbackRegistrar.add("Pref.ClickActionChange", boost::bind(&LLFloaterPreference::onClickActionChange, this));
-
gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("NameTagShowFriends")->getCommitSignal()->connect(boost::bind(&handleNameTagOptionChanged, _2));
gSavedSettings.getControl("UseDisplayNames")->getCommitSignal()->connect(boost::bind(&handleDisplayNamesOptionChanged, _2));
@@ -883,12 +879,6 @@ void LLFloaterPreference::apply()
}
saveAvatarProperties();
-
- if (mClickActionDirty)
- {
- updateClickActionSettings();
- mClickActionDirty = false;
- }
}
void LLFloaterPreference::cancel()
@@ -921,12 +911,6 @@ void LLFloaterPreference::cancel()
// reverts any changes to current skin
gSavedSettings.setString("SkinCurrent", sSkin);
- if (mClickActionDirty)
- {
- updateClickActionControls();
- mClickActionDirty = false;
- }
-
LLFloaterPreferenceProxy * advanced_proxy_settings = LLFloaterReg::findTypedInstance<LLFloaterPreferenceProxy>("prefs_proxy");
if (advanced_proxy_settings)
{
@@ -1008,9 +992,6 @@ void LLFloaterPreference::onOpen(const LLSD& key)
onChangeTextureFolder();
onChangeSoundFolder();
onChangeAnimationFolder();
-
- // Load (double-)click to walk/teleport settings.
- updateClickActionControls();
// Enabled/disabled popups, might have been changed by user actions
// while preferences floater was closed.
@@ -1891,10 +1872,6 @@ void LLFloaterPreference::onChangeQuality(const LLSD& data)
refresh();
}
-void LLFloaterPreference::onClickSetKey()
-{
-}
-
void LLFloaterPreference::onClickSetMiddleMouse()
{
LLUICtrl* p2t_line_editor = getChild<LLUICtrl>("modifier_combo");
@@ -2378,11 +2355,6 @@ void LLFloaterPreference::onClickAdvanced()
}
}
-void LLFloaterPreference::onClickActionChange()
-{
- mClickActionDirty = true;
-}
-
void LLFloaterPreference::onClickPermsDefault()
{
LLFloaterReg::showInstance("perms_default");
@@ -2420,26 +2392,6 @@ void LLFloaterPreference::onLogChatHistorySaved()
}
}
-void LLFloaterPreference::updateClickActionSettings()
-{
- const int single_clk_action = getChild<LLComboBox>("single_click_action_combo")->getValue().asInteger();
- const int double_clk_action = getChild<LLComboBox>("double_click_action_combo")->getValue().asInteger();
-
- gSavedSettings.setBOOL("ClickToWalk", single_clk_action == 1);
- gSavedSettings.setBOOL("DoubleClickAutoPilot", double_clk_action == 1);
- gSavedSettings.setBOOL("DoubleClickTeleport", double_clk_action == 2);
-}
-
-void LLFloaterPreference::updateClickActionControls()
-{
- const bool click_to_walk = gSavedSettings.getBOOL("ClickToWalk");
- const bool dbl_click_to_walk = gSavedSettings.getBOOL("DoubleClickAutoPilot");
- const bool dbl_click_to_teleport = gSavedSettings.getBOOL("DoubleClickTeleport");
-
- getChild<LLComboBox>("single_click_action_combo")->setValue((int)click_to_walk);
- getChild<LLComboBox>("double_click_action_combo")->setValue(dbl_click_to_teleport ? 2 : (int)dbl_click_to_walk);
-}
-
void LLFloaterPreference::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
{
LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
@@ -3048,70 +3000,6 @@ void LLPanelPreferenceGraphics::setHardwareDefaults()
//------------------------LLPanelPreferenceControls--------------------------------
static LLPanelInjector<LLPanelPreferenceControls> t_pref_contrls("panel_preference_controls");
-//name of control and name of icon if it is a group, likely 'TEMP' until xml gets properly populated
-typedef std::vector<std::pair<std::string, std::string> > controls_to_icon_t;
-static const controls_to_icon_t commands_and_headers =
-{
- //{ "control_view_actions", "Search_Icon" },
- //{ "control_interactions", "Command_Gestures_Icon" },
- { "control_movements", "Move_Walk_Off" },
- { "walk_to", "" },
- { "teleport_to", "" },
- { "push_forward", "" },
- { "push_backward", "" },
- { "turn_left", "" },
- { "turn_right", "" },
- { "slide_left", "" },
- { "slide_right", "" },
- { "jump", "" },
- { "push_down", "" },
- { "run_forward", "" },
- { "run_backward", "" },
- { "run_left", "" },
- { "run_right", "" },
- { "toggle_run", "" },
- { "toggle_fly", "" },
- { "toggle_sit", "" },
- { "stop_moving", "" },
- { "control_camera", "Cam_FreeCam_Off" },
- { "look_up", "" },
- { "look_down", "" },
- { "move_forward", "" },
- { "move_backward", "" },
- { "move_forward_fast", "" },
- { "move_backward_fast", "" },
- { "move_forward_sitting", "" },
- { "move_backward_sitting", "" },
- { "spin_over", "" },
- { "spin_under", "" },
- { "spin_over_sitting", "" },
- { "spin_under_sitting", "" },
- { "pan_up", "" },
- { "pan_down", "" },
- { "pan_left", "" },
- { "pan_right", "" },
- { "pan_in", "" },
- { "pan_out", "" },
- { "spin_around_ccw", "" },
- { "spin_around_cw", "" },
- { "spin_around_ccw_sitting", "" },
- { "spin_around_cw_sitting", "" },
- { "control_edit_title", "Tool_Dozer" },
- { "edit_avatar_spin_ccw", "" },
- { "edit_avatar_spin_cw", "" },
- { "edit_avatar_spin_over", "" },
- { "edit_avatar_spin_under", "" },
- { "edit_avatar_move_forward", "" },
- { "edit_avatar_move_backward", "" },
- { "control_mediacontent", "Audio_Press" },
- { "toggle_pause_media", "" },
- { "toggle_enable_media", "" },
- { "voice_follow_key", "" },
- { "toggle_voice", "" },
- { "start_chat", "" },
- { "start_gesture", "" },
-};
-
LLPanelPreferenceControls::LLPanelPreferenceControls()
:LLPanelPreference(),
mEditingColumn(-1),
@@ -3129,10 +3017,6 @@ LLPanelPreferenceControls::~LLPanelPreferenceControls()
BOOL LLPanelPreferenceControls::postBuild()
{
- //todo: add pitch/yaw?
- //todo: should be auto-expandable with menu items and should pull names from menu when possible
-
-
// populate list of controls
pControlsTable = getChild<LLScrollListCtrl>("controls_list");
pKeyModeBox = getChild<LLComboBox>("key_mode");
@@ -3144,47 +3028,6 @@ BOOL LLPanelPreferenceControls::postBuild()
return TRUE;
}
-void LLPanelPreferenceControls::addGroupRow(const std::string &control_name, const std::string &icon)
-{
- LLScrollListItem::Params item_params;
- item_params.value = "";
-
- LLScrollListCell::Params icon_cell_params;
- icon_cell_params.font = LLFontGL::getFontSansSerif();
- icon_cell_params.font_halign = LLFontGL::LEFT;
- icon_cell_params.type = "icontext";
-
- LLScrollListCell::Params cell_params;
- // init basic cell params
- cell_params.font = LLFontGL::getFontSansSerif();
- cell_params.font_halign = LLFontGL::LEFT;
-
- std::string label;
- if (hasString(control_name))
- {
- label = getString(control_name);
- }
- else
- {
- label = control_name;
- }
- icon_cell_params.column = "lst_action";
- icon_cell_params.text = label;
- icon_cell_params.value = icon;
- item_params.columns.add(icon_cell_params);
- //dummy cells
- cell_params.column = "lst_ctrl1";
- cell_params.value = "";
- item_params.columns.add(cell_params);
- cell_params.column = "lst_ctrl2";
- cell_params.value = "";
- item_params.columns.add(cell_params);
- cell_params.column = "lst_ctrl3";
- cell_params.value = "";
- item_params.columns.add(cell_params);
- pControlsTable->addRow(item_params, EAddPosition::ADD_BOTTOM);
-}
-
void LLPanelPreferenceControls::regenerateControls()
{
mEditingMode = pKeyModeBox->getValue().asInteger();
@@ -3195,58 +3038,74 @@ void LLPanelPreferenceControls::regenerateControls()
void LLPanelPreferenceControls::populateControlTable()
{
pControlsTable->clearRows();
-
- // todo: subsections need sorting?
- std::string label, control_name;
+ pControlsTable->clearColumns();
+
+ std::string filename;
+ switch ((LLKeyConflictHandler::ESourceMode)mEditingMode)
+ {
+ case LLKeyConflictHandler::MODE_THIRD_PERSON:
+ case LLKeyConflictHandler::MODE_FIRST_PERSON:
+ case LLKeyConflictHandler::MODE_EDIT:
+ case LLKeyConflictHandler::MODE_EDIT_AVATAR:
+ case LLKeyConflictHandler::MODE_SITTING:
+ filename = "control_table_contents.xml";
+ break;
+ default:
+ // 'saved settings' mode doesn't have UI or actual settings yet
+ LL_INFOS() << "Unimplemented mode" << LL_ENDL;
+ return;
+ }
+
+ std::string full_filename = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, filename);
+ LLSimpleXUIParser parser;
+ LLScrollListCtrl::Contents contents;
+ if (!parser.readXUI(full_filename, contents)
+ || !contents.validateBlock())
+ {
+ LL_INFOS() << "Failed to load" << LL_ENDL;
+ return;
+ }
+
+ for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator row_it = contents.columns.begin();
+ row_it != contents.columns.end();
+ ++row_it)
+ {
+ pControlsTable->addColumn(*row_it);
+ }
+
LLScrollListCell::Params cell_params;
// init basic cell params
cell_params.font = LLFontGL::getFontSansSerif();
cell_params.font_halign = LLFontGL::LEFT;
cell_params.column = "";
- cell_params.value = label;
+ cell_params.value = "";
- controls_to_icon_t::const_iterator iter = commands_and_headers.begin();
- controls_to_icon_t::const_iterator end = commands_and_headers.end();
- for (; iter != end; ++iter)
+
+ for (LLInitParam::ParamIterator<LLScrollListItem::Params>::const_iterator row_it = contents.rows.begin();
+ row_it != contents.rows.end();
+ ++row_it)
{
- if (iter->second.empty())
+ std::string control = row_it->value.getValue().asString();
+ if (!control.empty() && control != "menu_separator")
{
- // general control
- LLScrollListItem::Params item_params;
- item_params.value = LLSD(iter->first);
-
- cell_params.column = "lst_action";
- bool enabled = mConflictHandler[mEditingMode].canAssignControl(iter->first);
- if (hasString(iter->first))
- {
- label = getString(iter->first);
- }
- else
- {
- label = iter->first;
- }
- cell_params.value = label;
- item_params.columns.add(cell_params);
+ // At the moment 4 collumns are hardcoded
+ LLScrollListItem::Params item_params(*row_it);
+ bool enabled = mConflictHandler[mEditingMode].canAssignControl(control);
+ item_params.enabled.setValue(enabled);
cell_params.column = "lst_ctrl1";
- cell_params.value = mConflictHandler[mEditingMode].getControlString(iter->first, 0);
- cell_params.enabled = enabled;
+ cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 0);
item_params.columns.add(cell_params);
cell_params.column = "lst_ctrl2";
- cell_params.value = mConflictHandler[mEditingMode].getControlString(iter->first, 1);
- cell_params.enabled = enabled;
+ cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 1);
item_params.columns.add(cell_params);
cell_params.column = "lst_ctrl3";
- cell_params.value = mConflictHandler[mEditingMode].getControlString(iter->first, 2);
- cell_params.enabled = enabled;
+ cell_params.value = mConflictHandler[mEditingMode].getControlString(control, 2);
item_params.columns.add(cell_params);
-
pControlsTable->addRow(item_params, EAddPosition::ADD_BOTTOM);
}
else
{
- // header
- addSeparator();
- addGroupRow(iter->first, iter->second);
+ pControlsTable->addRow(*row_it, EAddPosition::ADD_BOTTOM);
}
}
}
@@ -3262,7 +3121,6 @@ void LLPanelPreferenceControls::addSeparator()
void LLPanelPreferenceControls::updateTable()
{
- pControlsTable->deselectAllItems();
mEditingControl.clear();
std::vector<LLScrollListItem*> list = pControlsTable->getAllData();
for (S32 i = 0; i < list.size(); ++i)
@@ -3278,6 +3136,7 @@ void LLPanelPreferenceControls::updateTable()
cell->setValue(mConflictHandler[mEditingMode].getControlString(control, 2));
}
}
+ pControlsTable->deselectAllItems();
}
void LLPanelPreferenceControls::apply()
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 9100a913561371c8b39c36a27902ed9ee7a1e1f8..c1f58d290b3f2429acf787e21c055db2f1d2d429 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -130,13 +130,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
// callback for when client turns on impostors
void onAvatarImpostorsEnable();
- // callback for commit in the "Single click on land" and "Double click on land" comboboxes.
- void onClickActionChange();
- // updates click/double-click action settings depending on controls values
- void updateClickActionSettings();
- // updates click/double-click action controls depending on values from settings.xml
- void updateClickActionControls();
-
public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
@@ -149,7 +142,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
void onClickResetCache();
void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
void onSelectSkin();
- void onClickSetKey();
void onClickSetMiddleMouse();
void onClickSetSounds();
void onClickEnablePopup();
@@ -204,7 +196,6 @@ class LLFloaterPreference : public LLFloater, public LLAvatarPropertiesObserver,
static std::string sSkin;
notifications_map mNotificationOptions;
- bool mClickActionDirty; ///< Set to true when the click/double-click options get changed by user.
bool mGotPersonalInfo;
bool mOriginalIMViaEmail;
bool mLanguageChanged;
@@ -316,7 +307,6 @@ class LLPanelPreferenceControls : public LLPanelPreference
void onCancelKeyBind();
private:
- void addGroupRow(const std::string &control_name, const std::string &icon);
void regenerateControls();
void populateControlTable();
void addSeparator();
diff --git a/indra/newview/llkeyconflict.cpp b/indra/newview/llkeyconflict.cpp
index c74eea6e478ffdb37c424af1f1f3a3f546cb1413..01230ea26aac0a6d27da19491f8ece3c9ddffaad 100644
--- a/indra/newview/llkeyconflict.cpp
+++ b/indra/newview/llkeyconflict.cpp
@@ -166,7 +166,8 @@ bool LLKeyConflictHandler::canAssignControl(const std::string &control_name)
{
return iter->second.mAssignable;
}
- return false;
+ // If we don't know this control means it wasn't assigned by user yet and thus is editable
+ return true;
}
bool LLKeyConflictHandler::registerControl(const std::string &control_name, U32 index, EMouseClickType mouse, KEY key, MASK mask, bool ignore_mask)
@@ -346,7 +347,7 @@ void LLKeyConflictHandler::loadFromSettings(ESourceMode load_mode)
// E.X. In case we need placeholder keys for conflict resolution.
generatePlaceholders(load_mode);
- if (load_mode == MODE_GENERAL)
+ if (load_mode == MODE_SAVED_SETTINGS)
{
// load settings clss knows about, but it also possible to load settings by name separately
const S32 size = std::extent<decltype(saved_settings_key_controls)>::value;
@@ -383,7 +384,7 @@ void LLKeyConflictHandler::saveToSettings()
return;
}
- if (mLoadMode == MODE_GENERAL)
+ if (mLoadMode == MODE_SAVED_SETTINGS)
{
control_map_t::iterator iter = mControlsMap.begin();
control_map_t::iterator end = mControlsMap.end();
@@ -548,7 +549,7 @@ LLKeyData LLKeyConflictHandler::getDefaultControl(const std::string &control_nam
{
return LLKeyData();
}
- if (mLoadMode == MODE_GENERAL)
+ if (mLoadMode == MODE_SAVED_SETTINGS)
{
LLControlVariablePtr var = gSavedSettings.getControl(control_name);
if (var)
@@ -590,7 +591,7 @@ void LLKeyConflictHandler::resetToDefaultAndResolve(const std::string &control_n
{
return;
}
- if (mLoadMode == MODE_GENERAL)
+ if (mLoadMode == MODE_SAVED_SETTINGS)
{
LLControlVariablePtr var = gSavedSettings.getControl(control_name);
if (var)
@@ -639,7 +640,7 @@ void LLKeyConflictHandler::resetToDefault(const std::string &control_name)
void LLKeyConflictHandler::resetToDefaults(ESourceMode mode)
{
- if (mode == MODE_GENERAL)
+ if (mode == MODE_SAVED_SETTINGS)
{
control_map_t::iterator iter = mControlsMap.begin();
control_map_t::iterator end = mControlsMap.end();
diff --git a/indra/newview/llkeyconflict.h b/indra/newview/llkeyconflict.h
index a0886bedce286428548aef7ce8c5ae8b18a4db65..e339264aaad2b12a04b6caf6e87f4a832d2674b1 100644
--- a/indra/newview/llkeyconflict.h
+++ b/indra/newview/llkeyconflict.h
@@ -62,7 +62,7 @@ class LLKeyConflictHandler
MODE_EDIT,
MODE_EDIT_AVATAR,
MODE_SITTING,
- MODE_GENERAL, // for settings from saved settings
+ MODE_SAVED_SETTINGS, // for settings from saved settings
MODE_COUNT
};
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 60159594c9d011d8afe4fe35bdf4f8f4f49d76b2..ac6751aac0fad8deec86a6bdb4e1272f1f770dec 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -110,7 +110,6 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
LLPointer<LLHUDEffectBlob> mAutoPilotDestination;
LLPointer<LLHUDEffectBlob> mMouseSteerGrabPoint;
bool mClockwise;
- bool mBlockClickToWalk;
LLUUID mMediaMouseCaptureID;
LLPickInfo mPick;
LLPickInfo mHoverPick;
diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
new file mode 100644
index 0000000000000000000000000000000000000000..00c2d271242710c9e38e718cdb568f2c686408b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<contents>
+ <columns
+ relative_width="0.34"
+ label="Action"
+ name="lst_action" />
+ <columns
+ relative_width="0.22"
+ label="Prymary Control"
+ name="lst_ctrl1" />
+ <columns
+ relative_width="0.22"
+ label="Alternate 1"
+ name="lst_ctrl2" />
+ <columns
+ relative_width="0.22"
+ label="Alternate 2"
+ name="lst_ctrl3" />
+ <rows
+ enabled="false"
+ value="">
+ <columns
+ cell_type="icontext"
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ label="Move Actions"
+ name="lst_action"
+ value="Move_Walk_Off" />
+ </rows>
+ <rows
+ value="walk_to">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Walk to location mouse cursor points to"
+ value="Walk to" />
+ </rows>
+ <rows
+ value="teleport_to">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Teleport to location mouse cursor points to, but not all locations allow direct teleportation so you might be teleported closer to destination instead"
+ value="Teleport to" />
+ </rows>
+ <rows
+ value="push_forward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Move Forward" />
+ </rows>
+ <rows
+ value="push_backward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Move Backward" />
+ </rows>
+ <rows
+ value="turn_left">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Left" />
+ </rows>
+ <rows
+ value="turn_right">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Right" />
+ </rows>
+ <rows
+ value="slide_left">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Strafe left" />
+ </rows>
+ <rows
+ value="slide_right">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Strafe right" />
+ </rows>
+ <rows
+ value="jump">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Jump/Up" />
+ </rows>
+ <rows
+ value="push_down">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Down" />
+ </rows>
+ <rows
+ value="run_forward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Run Forward" />
+ </rows>
+ <rows
+ value="run_backward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Run Backward" />
+ </rows>
+ <rows
+ value="run_left">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Run Left" />
+ </rows>
+ <rows
+ value="run_right">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Run Right" />
+ </rows>
+ <rows
+ value="toggle_run">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Toggle Run" />
+ </rows>
+ <rows
+ value="toggle_fly">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Fly/Stop flying" />
+ </rows>
+ <rows
+ value="toggle_sit">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Sit/Stand" />
+ </rows>
+ <rows
+ value="stop_moving">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Stop Moving" />
+ </rows>
+ <rows
+ enabled="false">
+ <columns
+ cell_type="icon"
+ color="0 0 0 0.7"
+ halign="center"
+ value="menu_separator" />
+ </rows>
+ <rows
+ enabled="false"
+ value="">
+ <columns
+ cell_type="icontext"
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ label="Camera"
+ name="lst_action"
+ value="Cam_FreeCam_Off" />
+ </rows>
+ <rows
+ value="look_up">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Look Up" />
+ </rows>
+ <rows
+ value="look_down">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Look Down" />
+ </rows>
+ <rows
+ value="move_forward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Forward" />
+ </rows>
+ <rows
+ value="move_backward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Backward" />
+ </rows>
+ <rows
+ value="move_forward_fast">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Forward Fast" />
+ </rows>
+ <rows
+ value="move_backward_fast">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Backward Fast" />
+ </rows>
+ <rows
+ value="move_forward_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Forward Sitting" />
+ </rows>
+ <rows
+ value="move_backward_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Backward Sitting" />
+ </rows>
+ <rows
+ value="spin_over">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Spin Over" />
+ </rows>
+ <rows
+ value="spin_under">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Spin Under" />
+ </rows>
+ <rows
+ value="spin_over_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Spin Over" />
+ </rows>
+ <rows
+ value="spin_under_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Spin Under" />
+ </rows>
+ <rows
+ value="pan_up">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan Up" />
+ </rows>
+ <rows
+ value="pan_down">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan Down" />
+ </rows>
+ <rows
+ value="pan_left">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan Left" />
+ </rows>
+ <rows
+ value="pan_right">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan Right" />
+ </rows>
+ <rows
+ value="pan_in">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan In" />
+ </rows>
+ <rows
+ value="pan_out">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Pan Out" />
+ </rows>
+ <rows
+ value="spin_around_ccw">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around counterclockwise"
+ value="Counterclockwise" />
+ </rows>
+ <rows
+ value="spin_around_cw">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around clockwise"
+ value="Clockwise" />
+ </rows>
+ <rows
+ value="spin_around_ccw_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around counterclockwise sitting"
+ value="Counterclockwise Sitting" />
+ </rows>
+ <rows
+ value="spin_around_cw_sitting">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around clockwise sitting"
+ value="Clockwise Sitting" />
+ </rows>
+ <rows
+ enabled="false">
+ <columns
+ cell_type="icon"
+ color="0 0 0 0.7"
+ halign="center"
+ value="menu_separator" />
+ </rows>
+ <rows
+ enabled="false"
+ value="">
+ <columns
+ cell_type="icontext"
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ label="Editing"
+ name="lst_action"
+ value="Tool_Dozer" />
+ </rows>
+ <rows
+ value="edit_avatar_spin_ccw">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around avatar counterclockwise"
+ value="Counterclockwise" />
+ </rows>
+ <rows
+ value="edit_avatar_spin_cw">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin around avatar clockwise"
+ value="Clockwise" />
+ </rows>
+ <rows
+ value="edit_avatar_spin_over">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin over avatar"
+ value="Camera Spin Over" />
+ </rows>
+ <rows
+ value="edit_avatar_spin_under">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ tool_tip="Camera spin under avatar"
+ value="Camera Spin Under" />
+ </rows>
+ <rows
+ value="edit_avatar_move_forward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Forward" />
+ </rows>
+ <rows
+ value="edit_avatar_move_backward">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Camera Backward" />
+ </rows>
+ <rows
+ enabled="false">
+ <columns
+ cell_type="icon"
+ color="0 0 0 0.7"
+ halign="center"
+ value="menu_separator" />
+ </rows>
+ <rows
+ enabled="false"
+ value="">
+ <columns
+ cell_type="icontext"
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ label="Sound and Media"
+ name="lst_action"
+ value="Audio_Press" />
+ </rows>
+ <rows
+ value="toggle_pause_media">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Play/Pause Media" />
+ </rows>
+ <rows
+ value="toggle_enable_media">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Play/Stop All Media" />
+ </rows>
+ <rows
+ value="voice_follow_key">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Voice" />
+ </rows>
+ <rows
+ value="toggle_voice">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Toggle Voice" />
+ </rows>
+ <rows
+ value="start_chat">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Start Chat" />
+ </rows>
+ <rows
+ value="start_gesture">
+ <columns
+ column="lst_action"
+ font="SansSerif"
+ halign="left"
+ name="lst_action"
+ value="Start Gesture" />
+ </rows>
+</contents>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
index b7b5280825978d2c5a53642f1b173114244ac8ea..eca3c550d5e6448ec859ed5c0ad1f0514d92be6a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_controls.xml
@@ -9,244 +9,6 @@
name="controls"
top="1"
width="517">
- <panel.string
- name="walk_to">
- Walk to
- </panel.string>
- <panel.string
- name="control_view_actions">
- View Actions
- </panel.string>
- <panel.string
- name="control_about">
- About/Profile
- </panel.string>
- <panel.string
- name="control_orbit">
- Orbit
- </panel.string>
- <panel.string
- name="control_pan">
- Pan
- </panel.string>
- <panel.string
- name="control_world_map">
- World Map
- </panel.string>
- <panel.string
- name="control_zoom">
- Zoom
- </panel.string>
- <panel.string
- name="control_interactions">
- Interactions
- </panel.string>
- <panel.string
- name="control_build">
- Build
- </panel.string>
- <panel.string
- name="control_drag">
- Drag
- </panel.string>
- <panel.string
- name="control_edit">
- Edit
- </panel.string>
- <panel.string
- name="control_menu">
- Menu
- </panel.string>
- <panel.string
- name="control_open">
- Open
- </panel.string>
- <panel.string
- name="control_touch">
- Touch
- </panel.string>
- <panel.string
- name="control_wear">
- Wear
- </panel.string>
- <panel.string
- name="control_movements">
- Move Actions
- </panel.string>
- <panel.string
- name="teleport_to">
- Teleport to
- </panel.string>
- <panel.string
- name="toggle_sit">
- Sit/Stand
- </panel.string>
- <panel.string
- name="control_teleportto">
- Teleport To
- </panel.string>
- <panel.string
- name="push_forward">
- Move Forward
- </panel.string>
- <panel.string
- name="push_backward">
- Move Backward
- </panel.string>
- <panel.string
- name="turn_left">
- Left
- </panel.string>
- <panel.string
- name="turn_right">
- Right
- </panel.string>
- <!--(check with move floater)-->
- <panel.string
- name="slide_left">
- Strafe left
- </panel.string>
- <panel.string
- name="slide_right">
- Strafe right
- </panel.string>
- <panel.string
- name="jump">
- Jump/Up
- </panel.string>
- <panel.string
- name="push_down">
- Down
- </panel.string>
- <panel.string
- name="control_run">
- Run
- </panel.string>
- <panel.string
- name="run_forward">
- Run Forward
- </panel.string>
- <panel.string
- name="run_backward">
- Run Backward
- </panel.string>
- <panel.string
- name="run_left">
- Run Left
- </panel.string>
- <panel.string
- name="run_right">
- Run Right
- </panel.string>
- <panel.string
- name="toggle_run">
- Toggle Run
- </panel.string>
- <panel.string
- name="toggle_fly">
- Fly/Stop flying
- </panel.string>
- <panel.string
- name="stop_moving">
- Stop Moving
- </panel.string>
- <panel.string
- name="control_camera">
- Camera
- </panel.string>
- <panel.string
- name="look_up">
- Look Up
- </panel.string>
- <panel.string
- name="look_down">
- Look Down
- </panel.string>
- <panel.string
- name="move_forward">
- Camera Forward
- </panel.string>
- <panel.string
- name="move_backward">
- Camera Backward
- </panel.string>
- <panel.string
- name="move_forward_fast">
- Camera Forward Fast
- </panel.string>
- <panel.string
- name="move_backward_fast">
- Camera Backward Fast
- </panel.string>
- <panel.string
- name="move_forward_sitting">
- Camera Forward Sitting
- </panel.string>
- <panel.string
- name="move_backward_sitting">
- Camera Backward Sitting
- </panel.string>
- <panel.string
- name="spin_over">
- Camera Spin Over
- </panel.string>
- <panel.string
- name="spin_under">
- Camera Spin Under
- </panel.string>
- <panel.string
- name="spin_over_sitting">
- Camera Spin Over
- </panel.string>
- <panel.string
- name="spin_under_sitting">
- Camera Spin Under
- </panel.string>
- <panel.string
- name="pan_up">
- Camera Pan Up
- </panel.string>
- <panel.string
- name="pan_down">
- Camera Pan Down
- </panel.string>
- <panel.string
- name="pan_left">
- Camera Pan Left
- </panel.string>
- <panel.string
- name="pan_right">
- Camera Pan Right
- </panel.string>
- <panel.string
- name="pan_left">
- Camera Pan In
- </panel.string>
- <panel.string
- name="pan_right">
- Camera Pan Out
- </panel.string>
- <panel.string
- name="control_mediacontent">
- Sound and Media
- </panel.string>
- <panel.string
- name="toggle_pause_media">
- Play/Pause Media
- </panel.string>
- <panel.string
- name="toggle_enable_media">
- Play/Stop All Media
- </panel.string>
- <panel.string
- name="voice_follow_key">
- Voice
- </panel.string>
- <panel.string
- name="toggle_voice">
- Toggle Voice
- </panel.string>
-
<combo_box
follows="top|left"
layout="topleft"
@@ -299,22 +61,6 @@
right="-3"
can_sort="false"
multi_select="false"
- name="controls_list">
- <scroll_list.columns
- relative_width="0.34"
- label="Action"
- name="lst_action" />
- <scroll_list.columns
- relative_width="0.22"
- label="Control Method 1"
- name="lst_ctrl1" />
- <scroll_list.columns
- relative_width="0.22"
- label="Control Method 2"
- name="lst_ctrl2" />
- <scroll_list.columns
- relative_width="0.22"
- label="Control Method 3"
- name="lst_ctrl3" />
- </scroll_list>
+ name="controls_list"
+ fg_disable_color="ScrollUnselectedColor"/>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 8794e3bf95ac9d54e4084203b16433e6b5a72208..d106456b31731e972afaa8f7063ba851c8601baf 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,70 +195,6 @@
name="invert_mouse"
top_delta="0"
width="128" />
- <text
- follows="left|top"
- type="string"
- length="1"
- height="10"
- layout="topleft"
- left="86"
- name="single_click_action_lbl"
- width="150"
- top_pad="20">
- Single click on land:
- </text>
- <combo_box
- height="23"
- layout="topleft"
- left_pad="10"
- top_delta="-6"
- name="single_click_action_combo"
- width="200">
- <combo_box.item
- label="No action"
- name="0"
- value="0"/>
- <combo_box.item
- label="Move to clicked point"
- name="1"
- value="1"/>
- <combo_box.commit_callback
- function="Pref.ClickActionChange"/>
- </combo_box>
- <text
- follows="left|top"
- type="string"
- length="1"
- height="10"
- layout="topleft"
- left="86"
- name="double_click_action_lbl"
- width="150"
- top_pad="12">
- Double click on land:
- </text>
- <combo_box
- height="23"
- layout="topleft"
- left_pad="10"
- top_delta="-6"
- name="double_click_action_combo"
- width="200">
- <combo_box.item
- label="No action"
- name="0"
- value="0"/>
- <combo_box.item
- label="Move to clicked point"
- name="1"
- value="1"/>
- <combo_box.item
- label="Teleport to clicked point"
- name="2"
- value="2"/>
- <combo_box.commit_callback
- function="Pref.ClickActionChange"/>
- </combo_box>
<button
height="23"
label="Other Devices"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index 90f2ca2713c98159488652c7d91a9f9457469cc2..6b54438b0561934e6c8735d1cfc015d9c5dab6c8 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -463,37 +463,13 @@
enabled_control="EnableVoiceChat"
control_name="PushToTalkToggle"
height="15"
- label="Toggle speak on/off when I press:"
+ label="Toggle speak on/off when I press button in toolbar"
layout="topleft"
left="44"
name="push_to_talk_toggle_check"
width="237"
tool_tip="When in toggle mode, press and release the trigger key ONCE to switch your microphone on or off. When not in toggle mode, the microphone broadcasts your voice only while the trigger is being held down."
top_pad="3"/>
- <line_editor
- follows="top|left"
- control_name="PushToTalkButton"
- enabled="false"
- enabled_control="EnableVoiceChat"
- height="23"
- left="80"
- max_length_bytes="200"
- name="modifier_combo"
- label="Push-to-Speak trigger"
- top_pad="3"
- width="200" />
- <button
- layout="topleft"
- follows="top|left"
- enabled_control="EnableVoiceChat"
- height="23"
- label="Set Key"
- left_pad="5"
- name="set_voice_hotkey_button"
- width="100">
- <button.commit_callback
- function="Pref.VoiceSetKey" />
- </button>
<button
enabled_control="EnableVoiceChat"
follows="top|left"