diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:04 -0800 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-11-09 13:16:04 -0800 |
commit | dc5db676efd340bccd2c6f376c0bcba77e0507c4 (patch) | |
tree | aba1c368d923d106789cddc59b5e4626f048dc44 /indra/newview/llbottomtray.cpp | |
parent | 2b5faa0b9cac3736b9d96a68cd13e05ee39ab7d1 (diff) | |
parent | 3b98043d227db07a2396b1fba056e911abd04621 (diff) |
merge
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); |