Merge downstream code - Vivox update

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 4904da728a..4944de6030 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -898,6 +898,14 @@ BOOL LLFace::genVolumeBBoxes(const LLVolume &volume, S32 f,
 			llassert(less_than_max_mag(newMax));
 		}
 
+		if (!mDrawablep->isActive())
+		{	// Shift position for region
+			LLVector4a offset;
+			offset.load3(mDrawablep->getRegion()->getOriginAgent().mV);
+			newMin.add(offset);
+			newMax.add(offset);
+		}
+
 		t.setAdd(newMin, newMax);
 		t.mul(0.5f);