diff options
| author | Richard Linden <none@none> | 2010-06-30 14:25:14 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-30 14:25:14 -0700 |
| commit | 43d51d4548916d37ec89f38d5209e20864c4885c (patch) | |
| tree | 00d131433d334cb6b211cffccd7692a6d7ce9576 /indra/newview | |
| parent | 2a7b291e5a5c6df64bdd0974ee4a70490ebed0b9 (diff) | |
| parent | 5d743c3c58b37dc6e9f261babfd5181906af752b (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_stats.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index f9dacf0207..b87cb9a433 100644 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -361,8 +361,7 @@ <stat_view name="physicsdetail" label="Physics Details" - show_label="true" - display_children="false"> + show_label="true"> <stat_bar name="physicspinnedtasks" label="Pinned Objects" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 88732fee7d..290c8c55a9 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4886,6 +4886,10 @@ If you want to view streaming media on parcels that support it you should go to persist="true" type="notify"> No Media Plugin was found to handle the "[MIME_TYPE]" mime type. Media of this type will be unavailable. + <unique> + <context key="[MIME_TYPE]"/> + </unique> + </notification> <notification icon="alertmodal.tga" |