diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-07-21 10:49:19 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-07-21 10:49:19 +0200 |
| commit | 912e99906b30c4558b755eb2c9e1c5efbde5e88c (patch) | |
| tree | fe6e44d9f218818876e454b07a5cee0b1cf278ba | |
| parent | 535f7187368286a9df13b7a5f2cdec63a26c5801 (diff) | |
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.
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
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; |