diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-02-23 16:11:51 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-02-23 16:11:51 -0800 |
| commit | 187acf0c3af6d5fee301137a49993fbc75039f38 (patch) | |
| tree | 259be436533a5f861bb90a4ba8ac3f8c32029c23 | |
| parent | 89c38f1f08b39bc07520624c5dd4f86f32b56091 (diff) | |
| parent | 3ce1d98046289f416b95b6c63b8e2560527358f0 (diff) | |
Merge
| -rw-r--r-- | indra/llui/llui.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llvoavatarself.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index caf04339c2..93c32f531f 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1943,6 +1943,7 @@ namespace LLInitParam { setBlockFromValue(); addSynonym(name, ""); + setBlockFromValue(); } void TypedParam<const LLFontGL*>::setValueFromBlock() const diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 00998b300a..4347dec805 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -211,6 +211,8 @@ BOOL LLVOAvatarSelf::buildSkeletonSelf(const LLVOAvatarSkeletonInfo *info) LLVector3 scale(1.f, aspect, 1.f); mScreenp->setScale(scale); mScreenp->setWorldPosition(LLVector3::zero); + // need to update screen agressively when sidebar opens/closes, for example + mScreenp->mUpdateXform = TRUE; return TRUE; } |