diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
| commit | 652c8f6b5e91e1333854ac5e300b0bf650d03fc2 (patch) | |
| tree | 4c0375dddbf315baa73c30fe648eb0915f3e3f2a /indra/newview/llpanelimcontrolpanel.h | |
| parent | af9b99b457a6a6ab9f04a20bcde6a90091321375 (diff) | |
| parent | 062d0a13db505636b186084d42c527a49637f380 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index ac5d86345e..923c5acbd2 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -43,7 +43,9 @@ class LLParticipantList; class LLPanelChatControlPanel : public LLPanel { public: - LLPanelChatControlPanel() {}; + LLPanelChatControlPanel() : + mSessionId(LLUUID()), + mInitialized(false) {}; ~LLPanelChatControlPanel() {}; virtual BOOL postBuild(); @@ -59,6 +61,7 @@ public: private: LLUUID mSessionId; + bool mInitialized; }; @@ -100,7 +103,7 @@ public: protected: LLUUID mGroupID; LLSpeakerMgr* mSpeakerManager; - LLAvatarList* mAvatarList; + LLParticipantList* mParticipantList; private: |