diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-10-26 13:41:45 +0200 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-10-26 13:41:45 +0200 |
| commit | a43b47086726c4062abf74675bc8913d36374d4f (patch) | |
| tree | a4bbeb1c8c1403cca8ecc97474fe4f0796b2cce8 /indra/newview/llfloaterpreference.h | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
| parent | 2bcef9312bc232ab4ff88a9e366aa071a0e2eb67 (diff) | |
Merge STORM-1577.
Resolved conflicts manually.
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 5c74e9f60c..7ee3294478 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -156,6 +156,7 @@ public: void onChangeMaturity(); void onClickBlockList(); void onClickProxySettings(); + void onClickTranslationSettings(); void applyUIColor(LLUICtrl* ctrl, const LLSD& param); void getUIColor(LLUICtrl* ctrl, const LLSD& param); |