diff options
| author | Aleric Inglewood | 2010-10-24 00:16:45 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-24 00:16:45 +0200 |
| commit | df41e471c1e7eca1dd50ad7e752f41c391c518c2 (patch) | |
| tree | 945b797af6fa9e96a914f315b09c97ce49caadec /linden/indra/newview/skins | |
| parent | Merge branch 'weekly' into webkit_plugins (diff) | |
| parent | IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting fe... (diff) | |
| download | meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.zip meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.gz meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.bz2 meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.xz | |
Merge branch 'weekly' into webkit_plugins
Conflicts:
linden/doc/contributions.txt
Renamed RED --> IMP. Merged entries from both.
Diffstat (limited to 'linden/indra/newview/skins')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/notifications.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index 78295d4..47eea07 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml | |||
| @@ -7026,6 +7026,7 @@ IM history could not be found for [NAME]. | |||
| 7026 | type="alert"> | 7026 | type="alert"> |
| 7027 | Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy! | 7027 | Show Look At is a debug setting that displays where an avatar's head is looking. Be aware: this will *NOT* show where an avatar's camera is actually pointed. This setting should not be relied on for any form of privacy! |
| 7028 | <usetemplate | 7028 | <usetemplate |
| 7029 | ignoretext="When setting Show Look At" | ||
| 7029 | name="okignore" | 7030 | name="okignore" |
| 7030 | yestext="OK"/> | 7031 | yestext="OK"/> |
| 7031 | </notification> | 7032 | </notification> |