diff options
| author | Richard Linden <none@none> | 2012-04-26 14:39:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-26 14:39:52 -0700 |
| commit | a0bb55adc6ff26595f20bed12cb6f1565011e246 (patch) | |
| tree | cbd25e29777ad9921b2fee2bd0b4d349caa4da61 /indra/newview/llnearbychathandler.cpp | |
| parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) | |
| parent | db316f830df45e1b0229ebcbdb5feedc5eb23913 (diff) | |
merge with viewer-release
Diffstat (limited to 'indra/newview/llnearbychathandler.cpp')
| -rw-r--r-- | indra/newview/llnearbychathandler.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp index 600fd395fb..4d9db01e0d 100644 --- a/indra/newview/llnearbychathandler.cpp +++ b/indra/newview/llnearbychathandler.cpp @@ -445,10 +445,8 @@ void LLNearbyChatScreenChannel::arrangeToasts() //----------------------------------------------------------------------------------------------- boost::scoped_ptr<LLEventPump> LLNearbyChatHandler::sChatWatcher(new LLEventStream("LLChat")); -LLNearbyChatHandler::LLNearbyChatHandler(e_notification_type type, const LLSD& id) +LLNearbyChatHandler::LLNearbyChatHandler() { - mType = type; - // Getting a Channel for our notifications LLNearbyChatScreenChannel::Params p; p.id = LLUUID(gSavedSettings.getString("NearByChatChannelUUID")); @@ -617,10 +615,6 @@ void LLNearbyChatHandler::processChat(const LLChat& chat_msg, } } -void LLNearbyChatHandler::onDeleteToast(LLToast* toast) -{ -} - //----------------------------------------------------------------------------------------------- // LLNearbyChatToast |