diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
| commit | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (patch) | |
| tree | beff520bbdca9f7a8aeeb7d4fc21b4a16b8b510c /indra/newview/llfloaterpreference.h | |
| parent | 88407a0f0c19f1ee36c176f2fdc2117646d65b80 (diff) | |
| parent | bde49506e5b1a854f832f6f47781eac35853b1a0 (diff) | |
merge latest builds from project integration repo
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(); |