diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-18 10:43:30 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-18 10:43:30 +0000 |
| commit | 22aa5eed910bbd1b366789cb96247899c744df75 (patch) | |
| tree | 40bf09c7239e6983b3eb279695b9f662ce4d4d0e /indra/newview/llimfloater.cpp | |
| parent | 939e48d38cf9f15e1f7220cc3860810badd8a778 (diff) | |
| parent | 125b779fb63cafe4e5df4d601542def1b4bc05f3 (diff) | |
merge.
Diffstat (limited to 'indra/newview/llimfloater.cpp')
| -rw-r--r-- | indra/newview/llimfloater.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 2c6543d6ca..c2c83191e0 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -367,8 +367,6 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock) LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*> (LLNotificationsUI::LLChannelManager::getInstance()-> findChannelByID(LLUUID(gSavedSettings.getString("NotificationChannelUUID")))); - - setCanResize(!docked); LLTransientDockableFloater::setDocked(docked, pop_on_undock); |