From 117e22047c5752352342d64e3fb7ce00a4eb8113 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:04 -0500
Subject: Second Life viewer sources 1.18.1.2

---
 linden/indra/newview/llhudtext.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden/indra/newview/llhudtext.cpp')

diff --git a/linden/indra/newview/llhudtext.cpp b/linden/indra/newview/llhudtext.cpp
index fce52f1..20bf486 100644
--- a/linden/indra/newview/llhudtext.cpp
+++ b/linden/indra/newview/llhudtext.cpp
@@ -859,7 +859,8 @@ void LLHUDText::updateAll()
 				}
 				if (src_textp->mSoftScreenRect.rectInRect(&dst_textp->mSoftScreenRect))
 				{
-					LLRectf intersect_rect = src_textp->mSoftScreenRect & dst_textp->mSoftScreenRect;
+					LLRectf intersect_rect = src_textp->mSoftScreenRect;
+					intersect_rect.intersectWith(dst_textp->mSoftScreenRect);
 					intersect_rect.stretch(-BUFFER_SIZE * 0.5f);
 					
 					F32 src_center_x = src_textp->mSoftScreenRect.getCenterX();
-- 
cgit v1.1