summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-12 19:39:30 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-12 19:39:30 +0100
commite2411ded41655d29af98f254aa5f322d0992bbad (patch)
tree445adef1eaa5e444711c32d46d30562f842b6e5f /indra/newview/llviewermessage.cpp
parent379ca3c30830f6060637173147269dc0b2b58d27 (diff)
parent265391fb3f88a97c5af868f3712bb7b06ad630c1 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r--indra/newview/llviewermessage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 4f51f15684..bb2378e489 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;