diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-27 19:53:33 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-27 19:53:33 +0300 |
| commit | a8e56e67c3545cf857f80e81b3e98a278224f421 (patch) | |
| tree | 0b4ee6c3c061ce23f47dbd2f237b68858f55bbf7 /indra/newview/llfloaterpreference.h | |
| parent | f71cce50f26c197c1b2ce510b7a646d22a2eab26 (diff) | |
SL-6109 Cleanup, run commands, and preparation for tooltip support
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 513fda96df..2fe3b98abd 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -317,7 +317,7 @@ public: void onCancelKeyBind(); private: - void addGroupRow(const std::string &icon, S32 index); + void addGroupRow(const std::string &control_name, const std::string &icon); void regenerateControls(); void populateControlTable(); void addSeparator(); @@ -327,7 +327,7 @@ private: LLComboBox *pKeyModeBox; LLScrollListCell *mHighlightedCell; LLKeyConflictHandler mConflictHandler[LLKeyConflictHandler::MODE_COUNT]; - S32 mEditingIndex; + std::string mEditingControl; S32 mEditingColumn; S32 mEditingMode; bool mShowKeyDialog; |