summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-11 19:05:51 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-11 19:05:51 +0000
commit773e8eb8ea3acc75b0e8137412458f77effffb70 (patch)
treeb3e5a3069ac0ef154f10971ae701940eab369fcc /indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
parent15ff4379e53eb5b3ed914c46c0051c3926de1ecb (diff)
parenta97c4d3ad879b8e53696b9cab9c5ab7141c7fc6c (diff)
merge from viewer2.
trivial xml conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_privacy.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f7e3ede93c..f78d90c434 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -17,6 +17,7 @@
follows="left|bottom"
height="23"
label="Clear History"
+ tool_tip="Clear login image, last location, teleport history, web, and texture cache"
layout="topleft"
left="30"
name="clear_cache"