diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 09:31:55 +0200 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-11-26 09:31:55 +0200 |
| commit | 4c81e7a85c3fe69f16ac3996df732627dda8533a (patch) | |
| tree | 25af0dff630ae8d5cbf5e572c8286122ebaf79a7 /indra/newview/llspeakbutton.h | |
| parent | 1533f3d2a6fcbfd1550b3840c2d2327283f131c0 (diff) | |
| parent | b19b63ad8cba7b1c3e44c4084313103765af1917 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llspeakbutton.h')
| -rw-r--r-- | indra/newview/llspeakbutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llspeakbutton.h b/indra/newview/llspeakbutton.h index 424ee5357a..33f7c9fa28 100644 --- a/indra/newview/llspeakbutton.h +++ b/indra/newview/llspeakbutton.h @@ -36,7 +36,7 @@ #include "llinitparam.h" #include "lluictrl.h" -class LLVoiceControlPanel; +class LLCallFloater; class LLButton; class LLOutputMonitorCtrl; @@ -91,7 +91,7 @@ protected: private: LLButton* mSpeakBtn; LLButton* mShowBtn; - LLVoiceControlPanel* mPrivateCallPanel; + LLHandle<LLFloater> mPrivateCallPanel; LLOutputMonitorCtrl* mOutputMonitor; }; |