diff options
Diffstat (limited to 'indra')
8 files changed, 15 insertions, 8 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index b2e3300ab3..ead013d6c6 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 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" /> |