diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-09-27 19:53:33 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-06-23 14:48:04 +0300 |
| commit | 0b8021870335ff9b9684fb193c6e0fe2f02b4091 (patch) | |
| tree | 418c417b7ee2f7602d78d6a2b084e0f78b77914c /indra/newview/llfloaterpreference.h | |
| parent | b12cf6696348520556cf70f96e0562776479fe70 (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 9178927e74..e07ead7e18 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -318,7 +318,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(); @@ -328,7 +328,7 @@ private: LLComboBox *pKeyModeBox; LLScrollListCell *mHighlightedCell; LLKeyConflictHandler mConflictHandler[LLKeyConflictHandler::MODE_COUNT]; - S32 mEditingIndex; + std::string mEditingControl; S32 mEditingColumn; S32 mEditingMode; bool mShowKeyDialog; |