diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-06 20:03:52 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-06 20:03:52 +0200 |
| commit | d60962324ad8cb3b7c02f9b2412b785d33099cea (patch) | |
| tree | 0e6e97c6a65751909f85064932b93c4f4698d1ca /indra/newview/llbottomtray.cpp | |
| parent | 0d10e916ecb0bfc61b57d7645bd213fc90b15f56 (diff) | |
| parent | 66171216b01c1c5afafd3405a9d17e81f50c1925 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index ddcee5f453..a17ba79078 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -47,7 +47,7 @@ LLBottomTray::LLBottomTray(const LLSD&) : mChicletPanel(NULL), mSysWell(NULL), - mTalkBtn(NULL), + mSpeakBtn(NULL), mNearbyChatBar(NULL), mToolbarStack(NULL) |