diff options
| author | Richard Linden <none@none> | 2012-02-15 10:24:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-15 10:24:45 -0800 |
| commit | a45ee6607b0b092cba26815417c734180fca3265 (patch) | |
| tree | 4303e7b3ade97a080c6a0cd8d825d601db72ac5c /indra/llui/llview.cpp | |
| parent | 54900461f98a57c602e624aec86338a07b825462 (diff) | |
| parent | 51a8134f62ff0705ede2534945e808ccbd9d6b7e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llview.cpp')
| -rw-r--r-- | indra/llui/llview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp index d22e14745f..421166dcd4 100644 --- a/indra/llui/llview.cpp +++ b/indra/llui/llview.cpp @@ -1300,7 +1300,10 @@ void LLView::reshape(S32 width, S32 height, BOOL called_from_parent) S32 delta_x = child_rect.mLeft - viewp->getRect().mLeft; S32 delta_y = child_rect.mBottom - viewp->getRect().mBottom; viewp->translate( delta_x, delta_y ); - viewp->reshape(child_rect.getWidth(), child_rect.getHeight()); + if (child_rect.getWidth() != viewp->getRect().getWidth() || child_rect.getHeight() != viewp->getRect().getHeight()) + { + viewp->reshape(child_rect.getWidth(), child_rect.getHeight()); + } } } |