summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-01-05 14:13:19 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-01-05 14:13:19 -0500
commit57363fdfd6921394be42000869e2d711e7212ea4 (patch)
treecc0f96310c91888458ad40ee0db205c9e34d7ed9 /indra/newview/llvoavatarself.cpp
parent79a89f5d921f99ba7a990a1dbf7428d1d3758bc6 (diff)
SL-92 WIP - More consistent enforcement of min/max hover values. Setting is stored as a per-account F32 value.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rwxr-xr-xindra/newview/llvoavatarself.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 6e0c9cb68c..1b5901e581 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -239,7 +239,8 @@ void LLVOAvatarSelf::initInstance()
return;
}
- mHoverOffset = gSavedPerAccountSettings.getVector3("AvatarPosFinalOffset");
+ F32 hover_z = gSavedPerAccountSettings.getF32("AvatarPosFinalOffset");
+ mHoverOffset = LLVector3(0.0, 0.0, llclamp(hover_z,MIN_HOVER_Z,MAX_HOVER_Z));
LL_INFOS("Avatar") << avString() << " set hover height from debug setting " << mHoverOffset[2] << LL_ENDL;
//doPeriodically(output_self_av_texture_diagnostics, 30.0);