diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index b2e3300ab3fac9058e1464c8497cc0dc2c056ffb..ead013d6c602652649415dc47b282b21926f7630 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -859,6 +859,14 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, newMax.setMax(newMax, tv[i]); } + if (!mDrawablep->isActive()) + { // Shift position for region + LLVector4a offset; + offset.load3(mDrawablep->getRegion()->getOriginAgent().mV); + newMin.add(offset); + newMax.add(offset); + } + LLVector4a t; t.setAdd(newMin,newMax); t.mul(0.5f); @@ -868,7 +876,6 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f, t.setSub(newMax,newMin); mBoundingSphereRadius = t.getLength3().getF32()*0.5f; - updateCenterAgent(); } 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 a73ea0cc055cf49ed97c890c860d9b5a1490e19a..47fae51face56e30442a67409d35b8233ef49628 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 500a5dc6d1f55d47f25636514e2c943efd02faf8..bcbc8d5b86c7df1ba7d93c0e69ee85e92b55769e 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 2ef18dbf9062a5ee252d3f51aaf9839484eea036..935b5b3ea06ad4da72df9fc28b3ae1b4641dbddc 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 362dca698f44053f2aeecc3dea8841814fd78658..ca0c9bd5e4947d8235235fc6b7c65364df09edae 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 7b40e895357c610ceafcc66ec9da204b851d658a..2ad5cbbe951cd561d4b72ab58fa5afb16380842b 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 41d5613623acda3cec61386e4ff803894ca539f7..a4261bf39e6ea5f411d477fa195132e765ccdcfd 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 97b24d2aba592a5aa5644c5e7794e6fd26a19d46..52ab7da51550113eb57baca78fa4ac8f1a3f35b9 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" />