diff options
author | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-19 11:43:47 +0800 |
commit | 6e5f529a7adb53fa021986aed6e6b1b229cc0efd (patch) | |
tree | a031044cfb6618a5b36a0e80d0fc3a918dfa07a9 /indra/newview/llimfloater.h | |
parent | a35fbddb910fa0dd068622c3dc64af1b27ca19b7 (diff) | |
parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) |
branch merge
Diffstat (limited to 'indra/newview/llimfloater.h')
-rw-r--r-- | indra/newview/llimfloater.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 065441b188..e2d500d821 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -63,7 +63,6 @@ public: // LLFloater overrides /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void setDocked(bool docked, bool pop_on_undock = true); - // override LLFloater's minimization according to EXT-1216 // Make IM conversion visible and update the message history static LLIMFloater* show(const LLUUID& session_id); |