diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:18 -0800 |
| commit | b34b82f7fea702b7cb4309195314c45fd3d2e630 (patch) | |
| tree | 8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/newview/llbottomtray.cpp | |
| parent | 06ba4927aa8d288b843ed1380132c14938708707 (diff) | |
| parent | dc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff) | |
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index a17ba79078..e5cc2fce88 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -50,7 +50,6 @@ LLBottomTray::LLBottomTray(const LLSD&) mSpeakBtn(NULL), mNearbyChatBar(NULL), mToolbarStack(NULL) - { mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL); |