diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-17 15:15:23 -0800 |
commit | 913eff0f675ba8938e298d24e8ef6d5c9c594acb (patch) | |
tree | c7ce6bbdfa41efc25d899a981024f6a068e2782b /indra/newview/llimfloater.h | |
parent | 889456e8924738936a9ee51a55d54d29ddd88bee (diff) | |
parent | 3b3fa1c0ab74546538a02a69098afc99eddd49f5 (diff) |
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); |