diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:42:25 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-09-26 17:42:25 -0700 |
| commit | 756532ba8a0a29ca7e5991d8a4f48ddac3bf06ac (patch) | |
| tree | 50e815635d579aa203f9b8dfb8414f2483bf568e /indra/llui/lltoolbarview.cpp | |
| parent | 53a486649381af53d21de28aced388bc2aacac0f (diff) | |
| parent | a465f816b8e7674aa3f22023d7708106ca35b350 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llui/lltoolbarview.cpp')
| -rw-r--r-- | indra/llui/lltoolbarview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llui/lltoolbarview.cpp b/indra/llui/lltoolbarview.cpp index 6c29e566b8..21d3785c82 100644 --- a/indra/llui/lltoolbarview.cpp +++ b/indra/llui/lltoolbarview.cpp @@ -93,8 +93,7 @@ void LLToolBarView::draw() if (mToolbarBottom) bottom_rect = mToolbarBottom->getRect(); if (mToolbarLeft) left_rect = mToolbarLeft->getRect(); if (mToolbarRight) right_rect = mToolbarRight->getRect(); - - LLRect sizer_left_rect = sizer_left->getRect(); + if ((old_width != getRect().getWidth()) || (old_height != getRect().getHeight())) debug_print = true; @@ -105,7 +104,6 @@ void LLToolBarView::draw() llinfos << "Merov debug : draw bottom rect = " << bottom_rect.mLeft << ", " << bottom_rect.mTop << ", " << bottom_rect.mRight << ", " << bottom_rect.mBottom << llendl; llinfos << "Merov debug : draw left rect = " << left_rect.mLeft << ", " << left_rect.mTop << ", " << left_rect.mRight << ", " << left_rect.mBottom << llendl; llinfos << "Merov debug : draw right rect = " << right_rect.mLeft << ", " << right_rect.mTop << ", " << right_rect.mRight << ", " << right_rect.mBottom << llendl; - llinfos << "Merov debug : draw s left rect = " << sizer_left_rect.mLeft << ", " << sizer_left_rect.mTop << ", " << sizer_left_rect.mRight << ", " << sizer_left_rect.mBottom << llendl; old_width = ctrl_rect.getWidth(); old_height = ctrl_rect.getHeight(); debug_print = false; |