diff options
| author | simon <none@none> | 2013-08-01 16:19:49 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-01 16:19:49 -0700 |
| commit | ee25146ce4cac282d70b8cc32d58613e31f197f9 (patch) | |
| tree | 88d53cd2a7e73f6722cdeac5c6875ebf5ed1dcc4 /indra/newview/skins | |
| parent | 9f60fc46e2454bb5d711ba6d136e2cd47ba2b8eb (diff) | |
| parent | 570884d73007aea2438f3faa1181129a16bad359 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/skins')
7 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index a73ea0cc05..47fae51fac 100755 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -151,7 +151,7 @@ <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 500a5dc6d1..bcbc8d5b86 100755 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -147,7 +147,7 @@ name="Edit Outfit"> layout="topleft" /> <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 2ef18dbf90..935b5b3ea0 100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -144,7 +144,7 @@ <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index 362dca698f..ca0c9bd5e4 100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -273,7 +273,7 @@ layout="topleft" /> <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_land.xml b/indra/newview/skins/default/xui/en/menu_land.xml index 7b40e89535..2ad5cbbe95 100755 --- a/indra/newview/skins/default/xui/en/menu_land.xml +++ b/indra/newview/skins/default/xui/en/menu_land.xml @@ -65,7 +65,7 @@ layout="topleft" /> <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_mute_particle.xml b/indra/newview/skins/default/xui/en/menu_mute_particle.xml index 41d5613623..a4261bf39e 100644 --- a/indra/newview/skins/default/xui/en/menu_mute_particle.xml +++ b/indra/newview/skins/default/xui/en/menu_mute_particle.xml @@ -5,7 +5,7 @@ name="Mute Particle Pie"> <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 97b24d2aba..52ab7da515 100755 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -200,7 +200,7 @@ layout="topleft" /> <menu_item_call enabled="false" - label="Mute Particle Owner" + label="Block Particle Owner" name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> |