diff options
Diffstat (limited to 'linden/indra/newview/llfloaterdirectory.cpp')
-rw-r--r-- | linden/indra/newview/llfloaterdirectory.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp index f386f5b..1693532 100644 --- a/linden/indra/newview/llfloaterdirectory.cpp +++ b/linden/indra/newview/llfloaterdirectory.cpp | |||
@@ -470,37 +470,6 @@ void LLFloaterDirectory::setVisible(BOOL visible) | |||
470 | LLFloater::setVisible(visible); | 470 | LLFloater::setVisible(visible); |
471 | } | 471 | } |
472 | 472 | ||
473 | // virtual | ||
474 | void LLFloaterDirectory::setMinimized(BOOL b) | ||
475 | { | ||
476 | mMinimizing = true; | ||
477 | LLFloater::setMinimized(b); | ||
478 | mMinimizing = false; | ||
479 | } | ||
480 | |||
481 | // virtual | ||
482 | void LLFloaterDirectory::reshape(S32 width, S32 height, BOOL called_from_parent) | ||
483 | { | ||
484 | // HACK: If the window (screen window) is made too small, the search floater | ||
485 | // will get resized below its minimum size, resulting in buttons hanging off | ||
486 | // the edge. So we need to limit reshape size. | ||
487 | // BUT: Minimizing the window is considered a resize. | ||
488 | // Remove this code when DEV-5670 is fixed ("Sanitize floater sizing behavior | ||
489 | // when SL window is made very small"). JC | ||
490 | if (!mMinimizing) | ||
491 | { | ||
492 | if (width < getMinWidth()) | ||
493 | { | ||
494 | width = getMinWidth(); | ||
495 | } | ||
496 | if (height < getMinHeight()) | ||
497 | { | ||
498 | height = getMinHeight(); | ||
499 | } | ||
500 | } | ||
501 | LLFloater::reshape(width, height, called_from_parent); | ||
502 | } | ||
503 | |||
504 | void LLFloaterDirectory::onClose(bool app_quitting) | 473 | void LLFloaterDirectory::onClose(bool app_quitting) |
505 | { | 474 | { |
506 | setVisible(FALSE); | 475 | setVisible(FALSE); |