diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-25 10:12:54 -0800 |
| commit | 6ff6ed4d1148a66b188472c94b58bd573389942d (patch) | |
| tree | a4a6e2a4711c3d9a3dd019e98507a568cac4ba60 /indra/newview/llpanelgroup.h | |
| parent | f11f8b34478f0d408689fe7959f233567001374d (diff) | |
| parent | 254b7d72d17c279aa906ee235f08ff1fa9e2b9cf (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llpanelgroup.h')
| -rw-r--r-- | indra/newview/llpanelgroup.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h index 7ea5e67b44..8c84695677 100644 --- a/indra/newview/llpanelgroup.h +++ b/indra/newview/llpanelgroup.h @@ -35,6 +35,7 @@ #include "llgroupmgr.h" #include "llpanel.h" #include "lltimer.h" +#include "llvoiceclient.h" struct LLOfferInfo; @@ -47,7 +48,8 @@ class LLAgent; class LLPanelGroup : public LLPanel, - public LLGroupMgrObserver + public LLGroupMgrObserver, + public LLVoiceClientStatusObserver { public: LLPanelGroup(); @@ -64,6 +66,10 @@ public: // Group manager observer trigger. virtual void changed(LLGroupChange gc); + // Implements LLVoiceClientStatusObserver::onChange() to enable the call + // button when voice is available + /*virtual*/ void onChange(EStatusType status, const std::string &channelURI, bool proximal); + void showNotice(const std::string& subject, const std::string& message, const bool& has_inventory, |