diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:14 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-08-11 00:37:14 +0300 |
| commit | b540e9f401c4e63ed6488e49a828829f8b5bfb01 (patch) | |
| tree | f8ed027616215a58e80b910a0cc0ede1ddd91350 /indra/llxml | |
| parent | 703cbef8ab07db9fe65a39c577377a3e40f63728 (diff) | |
| parent | 89cde15fb8c52071805af78e61848e743f2ab2f1 (diff) | |
Merged master into DRTVWR-514-keymappings
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llcontrol.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index e2dac5a1de..99946607f4 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -200,8 +200,6 @@ public: LLControlGroup(const std::string& name); ~LLControlGroup(); void cleanup(); - - typedef LLInstanceTracker<LLControlGroup, std::string>::instance_iter instance_iter; LLControlVariablePtr getControl(const std::string& name); |