diff options
| author | Richard Linden <none@none> | 2012-02-10 16:42:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-10 16:42:04 -0800 |
| commit | 5cfedfe4db3639863cf0cd0ae90e8b6a58a221dd (patch) | |
| tree | 31f92293307cf7153ef38675e720e8c4d1c4498a /indra/llui/llview.cpp | |
| parent | 5d276be881593b9e2c247edf8e6361447e964d52 (diff) | |
| parent | 6a6cf3aa78b328c5a4cb78ad1b4f9f2fb831c8e4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge/
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()); + } } } |