summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-12 18:51:13 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-06-12 18:51:13 +0300
commitb1f9de4d377c37d1e97f5ef06cbb438cdc755f6f (patch)
tree6ecae727643fa36d94ec30007a23ec1f0ad6e147 /indra/newview/llfloaterpreference.h
parent150af85b01aba24e5b006febe58ff17c72f0366b (diff)
SL-13421 Removed camera control keybindings from mouselook
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
-rw-r--r--indra/newview/llfloaterpreference.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 6c2e655270..ea6e1070cd 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -312,8 +312,14 @@ private:
// reloads settings, discards current changes, updates table
void regenerateControls();
+ // These fuctions do not clean previous content
+ bool addControlTableColumns(const std::string &filename);
+ bool addControlTableRows(const std::string &filename);
+ void addControlTableSeparator();
+
+ // Cleans content and then adds content from xml files according to current mEditingMode
void populateControlTable();
- void addSeparator();
+ // Updates keybindings from storage to table
void updateTable();
LLScrollListCtrl* pControlsTable;