diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-05 13:17:19 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-05 13:17:19 +0000 |
| commit | 6d6fcc46ef219c8b6df1c8707ea22dbd866dc315 (patch) | |
| tree | 97ee5cd51b59a0fc2ebae0017cb8f804637a79c4 /indra/newview/llbottomtray.h | |
| parent | 95738da3d82b92e82744dbc6b377a3feae2e6441 (diff) | |
| parent | 179f18d1ab5cc93509339684029cf7e4fe0b3eaa (diff) | |
Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' button which is broken on trunk.
Diffstat (limited to 'indra/newview/llbottomtray.h')
| -rw-r--r-- | indra/newview/llbottomtray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index a28f1e42ec..02588a1975 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -43,7 +43,7 @@ class LLChicletPanel; class LLLineEditor; class LLLayoutStack; class LLNotificationChiclet; -class LLTalkButton; +class LLSpeakButton; class LLNearbyChatBar; class LLIMChiclet; @@ -110,7 +110,7 @@ protected: LLChicletPanel* mChicletPanel; LLNotificationChiclet* mSysWell; - LLTalkButton* mTalkBtn; + LLSpeakButton* mSpeakBtn; LLNearbyChatBar* mNearbyChatBar; LLLayoutStack* mToolbarStack; LLMenuGL* mBottomTrayContextMenu; |