diff options
| author | Richard Linden <none@none> | 2012-04-11 19:07:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-11 19:07:36 -0700 |
| commit | a6db2d17593d37c72e96bb9c8cb97fa8afeb8581 (patch) | |
| tree | 5ed91e1647193fabc966c5069718cf0f17210562 /indra/newview | |
| parent | 87257b24e4f955ddb254636a844f5574e31f695f (diff) | |
| parent | 571a929040d2303f4b0917337d4900229a08f99e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index ef59e366e8..0ae95c6eff 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -196,7 +196,7 @@ const F32 CHAT_FADE_TIME = 8.0; const F32 BUBBLE_CHAT_TIME = CHAT_FADE_TIME * 3.f; const F32 NAMETAG_UPDATE_THRESHOLD = 0.3f; const F32 NAMETAG_VERTICAL_SCREEN_OFFSET = 25.f; -const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.15f; +const F32 NAMETAG_VERT_OFFSET_WEIGHT = 0.17f; const LLColor4 DUMMY_COLOR = LLColor4(0.5,0.5,0.5,1.0); |