diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-05-06 18:31:17 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-05-06 18:31:17 -0400 |
| commit | e6bc0c5d695796c56bdc2a53f5db594e93e58aff (patch) | |
| tree | 5495976b45eb9b56d8c7bd8adf76b46825688a29 | |
| parent | c9aae997a00c994c6e9fee08d09de64d5745cb16 (diff) | |
SH-4147 FIX macro avatars with low hover look wrong after relog
Preventing hover limit from being applied during startup or shutdown
when the rigged mesh may not be fully loaded.
| -rwxr-xr-x | 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 e2ed6f54cc..8e7bed39c4 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -5222,7 +5222,7 @@ void LLVOAvatar::computeBodySize() // Certain configurations of avatars can force the overall height (with offset) to go negative. // Enforce a constraint to make sure we don't go below 0.1 meters. // Camera positioning and other things start to break down when your avatar is "walking" while being fully underground - if (isSelf() && getWearableData()) + if (isSelf() && getWearableData() && isFullyLoaded() && !LLApp::isQuitting()) { LLViewerWearable* shape = (LLViewerWearable*)getWearableData()->getWearable(LLWearableType::WT_SHAPE, 0); if (shape && !shape->getVolitile()) |