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.h | |
| parent | 939e48d38cf9f15e1f7220cc3860810badd8a778 (diff) | |
| parent | 125b779fb63cafe4e5df4d601542def1b4bc05f3 (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); |