diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 14:01:00 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-01 14:01:00 -0700 |
| commit | c179c687db4caba0d88a7be9e04c47d7f0e1952a (patch) | |
| tree | d0819729d56d5221bb4829f8bf36c9e343ba74c5 /indra/newview/llimfloater.h | |
| parent | 8e1a9e2813da6b9d5c17795b375098fb6a386ee1 (diff) | |
| parent | d54eded93ba270402349f5f337bbe12339255ece (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llimfloater.h')
| -rw-r--r-- | indra/newview/llimfloater.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 489e430b26..5ed1d1ab35 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -71,14 +71,13 @@ public: static LLIMFloater* findInstance(const LLUUID& session_id); static LLIMFloater* getInstance(const LLUUID& session_id); - static void addToHost(const LLUUID& session_id); + static void addToHost(const LLUUID& session_id, const bool force = false); // LLFloater overrides /*virtual*/ void onClose(bool app_quitting); /*virtual*/ void setDocked(bool docked, bool pop_on_undock = true); // Make IM conversion visible and update the message history static LLIMFloater* show(const LLUUID& session_id); - static LLIMFloater* addToIMContainer(const LLUUID& session_id); // Toggle panel specified by session_id // Returns true iff panel became visible |