diff options
| author | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-11 10:22:50 -0800 |
| commit | a87b99cd950de20dc55e1ae6ce7186863a554326 (patch) | |
| tree | 43d1385397cbefac07934588824a3d0716fc6365 /indra/newview/llpanelimcontrolpanel.h | |
| parent | b26694f2ab4d88fb8a0e4b1f0e8733f111af4522 (diff) | |
| parent | c74d5c483cbd75c5e2a0b17c8980755a9932c53a (diff) | |
Merge, fixed conflict in panel_preferences_sound.xml
Diffstat (limited to 'indra/newview/llpanelimcontrolpanel.h')
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h index 871779b273..711340efc7 100644 --- a/indra/newview/llpanelimcontrolpanel.h +++ b/indra/newview/llpanelimcontrolpanel.h @@ -45,8 +45,7 @@ class LLPanelChatControlPanel : public LLPanel { public: LLPanelChatControlPanel() : - mSessionId(LLUUID()), - mInitialized(false) {}; + mSessionId(LLUUID()) {}; ~LLPanelChatControlPanel(); virtual BOOL postBuild(); @@ -63,7 +62,6 @@ public: private: LLUUID mSessionId; - bool mInitialized; // connection to voice channel state change signal boost::signals2::connection mVoiceChannelStateChangeConnection; |