diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-06-08 14:53:00 -0700 |
| commit | 484a4733b7b361d87c6092f4f399951e84c2aacd (patch) | |
| tree | 3031f4f041ffbe87f57d3a58e8ecf3bc988f439b /indra/newview/llfloaterpreference.h | |
| parent | 3dfb4944ed916f9a251078a2614a854b9de0315d (diff) | |
| parent | 68a7c4cb83aca58e6ad9162be9e5022d6f801eac (diff) | |
Merge latest from lindenlab/viewer-development/
Diffstat (limited to 'indra/newview/llfloaterpreference.h')
| -rw-r--r-- | indra/newview/llfloaterpreference.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 5fe509fb37..ef92575347 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -88,7 +88,8 @@ protected: void onBtnCancel(); void onBtnApply(); - void onClickBrowserClearCache(); + void onClickClearCache(); // Clear viewer texture cache, vfs, and VO cache on next startup + void onClickBrowserClearCache(); // Clear web history and caches as well as viewer caches above void onLanguageChange(); void onNameTagOpacityChange(const LLSD& newvalue); @@ -99,7 +100,7 @@ protected: void onChangeCustom(); void updateMeterText(LLUICtrl* ctrl); void onOpenHardwareSettings(); - /// callback for defaults + // callback for defaults void setHardwareDefaults(); // callback for when client turns on shaders void onVertexShaderEnable(); |