From 535f7187368286a9df13b7a5f2cdec63a26c5801 Mon Sep 17 00:00:00 2001
From: ziree <none@none>
Date: Sun, 17 Jul 2011 17:26:40 +0200
Subject: Proposed fix for FIRE-543 - Hovertext renders as overlay on top of
 everything else (transplanted from 7af0278beaefa4fb1eb9a41f4e9317ac5fe37690)

---
 indra/llrender/llfontgl.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index d6c062fc5e..328d520417 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -195,6 +195,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	origin.mV[VX] -= llround((F32)sCurOrigin.mX) - (sCurOrigin.mX);
 	origin.mV[VY] -= llround((F32)sCurOrigin.mY) - (sCurOrigin.mY);
 
+	// don't forget to do the depth translation, too. -Zi
+	gGL.translatef(0.f,0.f,sCurOrigin.mZ);
 
 	S32 chars_drawn = 0;
 	S32 i;
-- 
cgit v1.2.3


From 912e99906b30c4558b755eb2c9e1c5efbde5e88c Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Thu, 21 Jul 2011 10:49:19 +0200
Subject: Credit Zi: FIRE-543 change fixes SH-489 and VWR-24017 and therefore
 also VWR-25588

It looks like the parent changeset (86eec7b46566; transplanted from
http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/7af0278beaef)
fixes the following issues:
* SH-489 (object hover text not occluded)
* VWR-24017 (nametag / bubblechat not occluded)
* VWR-25588 (union of the above two symptopms)

Thus list them all under Zi's entry in doc/contributions.txt.

Also removed her name from the in-code comment, to adhere to our CS.
---
 doc/contributions.txt       | 3 +++
 indra/llrender/llfontgl.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index c8125c675f..ef0383abe9 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -668,12 +668,15 @@ Wilton Lundquist
 Zarkonnen Decosta
 	VWR-253
 Zi Ree
+	SH-489
 	VWR-423
 	VWR-671
 	VWR-682
 	VWR-684
 	VWR-9127
 	VWR-1140
+	VWR-24017
+	VWR-25588
 Zipherius Turas
 	VWR-76
 	VWR-77
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index 328d520417..d23cb2e151 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -195,7 +195,7 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	origin.mV[VX] -= llround((F32)sCurOrigin.mX) - (sCurOrigin.mX);
 	origin.mV[VY] -= llround((F32)sCurOrigin.mY) - (sCurOrigin.mY);
 
-	// don't forget to do the depth translation, too. -Zi
+	// don't forget to do the depth translation, too.
 	gGL.translatef(0.f,0.f,sCurOrigin.mZ);
 
 	S32 chars_drawn = 0;
-- 
cgit v1.2.3


From 1a1a4beb52eb8f9ca11861e7787603bf585026f7 Mon Sep 17 00:00:00 2001
From: Boroondas Gupte <hg@boroon.dasgupta.ch>
Date: Thu, 21 Jul 2011 10:54:22 +0200
Subject: FIRE-543/VWR-25588: made in-code comment a bit clearer

---
 indra/llrender/llfontgl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index d23cb2e151..57eac4736b 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -195,7 +195,8 @@ S32 LLFontGL::render(const LLWString &wstr, S32 begin_offset, F32 x, F32 y, cons
 	origin.mV[VX] -= llround((F32)sCurOrigin.mX) - (sCurOrigin.mX);
 	origin.mV[VY] -= llround((F32)sCurOrigin.mY) - (sCurOrigin.mY);
 
-	// don't forget to do the depth translation, too.
+	// Depth translation, so that floating text appears 'inworld'
+	// and is correclty occluded.
 	gGL.translatef(0.f,0.f,sCurOrigin.mZ);
 
 	S32 chars_drawn = 0;
-- 
cgit v1.2.3