diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-05-12 14:10:44 +0300 |
| commit | fbaae0a2df3b68756c7d910438041887d018cd63 (patch) | |
| tree | aceb50a59cb304de950abfb7dc7f0060b8f7bb94 /indra/newview/llviewermessage.cpp | |
| parent | 36e84baea4510369e1f947c46368d93995a1f9fb (diff) | |
| parent | 367b77eb1b87ba55fd4a94e9b2630a7d002d4399 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 71e50cacfd..742516f351 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2328,7 +2328,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) LLSD args; args["MESSAGE"] = message; - LLNotificationsUtil::add("JoinGroup", args, payload, join_group_response); + // we shouldn't pass callback functor since it is registered in LLFunctorRegistration + LLNotificationsUtil::add("JoinGroup", args, payload); } } break; |