diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-13 15:15:51 -0800 |
| commit | eae15689d8af7e2cd37108fda833bcc87f63eb4b (patch) | |
| tree | 735dc7ac82a5d9f665b8fee5bd191381037f77db /indra/newview/llimfloatercontainer.h | |
| parent | c316edda259a3914ceb0c646a543f144c370a39b (diff) | |
| parent | 6ad8674a8c5a87f438aa5ad6230396a859ba268e (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llimfloatercontainer.h')
| -rw-r--r-- | indra/newview/llimfloatercontainer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimfloatercontainer.h b/indra/newview/llimfloatercontainer.h index ead7cf4730..d4a542dfc2 100644 --- a/indra/newview/llimfloatercontainer.h +++ b/indra/newview/llimfloatercontainer.h @@ -52,7 +52,11 @@ public: LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END); static LLFloater* getCurrentVoiceFloater(); - + + static LLIMFloaterContainer* findInstance(); + + static LLIMFloaterContainer* getInstance(); + protected: LLFloater* mActiveVoiceFloater; |