diff options
| -rw-r--r-- | indra/newview/llfloaterimnearbychatlistener.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llluamanager.cpp | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/indra/newview/llfloaterimnearbychatlistener.cpp b/indra/newview/llfloaterimnearbychatlistener.cpp index 78642bce21..e61bf5ffc2 100644 --- a/indra/newview/llfloaterimnearbychatlistener.cpp +++ b/indra/newview/llfloaterimnearbychatlistener.cpp @@ -54,12 +54,11 @@ LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener() add("listen", "Start listening to the Nearby chat, chat messages will be resent to the script event pump", &LLFloaterIMNearbyChatListener::listenChat, - llsd::map("coro_name", LLSD(), "reply", LLSD())); + llsd::map("reply", LLSD())); add("stopListening", "Stop listening to the Nearby chat", - &LLFloaterIMNearbyChatListener::stopListeningChat, - llsd::map("coro_name", LLSD())); + &LLFloaterIMNearbyChatListener::stopListeningChat); mOutConnection = LLEventPumps::instance().obtain("LLNearbyChat").listen("LLFloaterIMNearbyChatListener", [this](const LLSD &data) { @@ -136,10 +135,10 @@ void LLFloaterIMNearbyChatListener::sendChat(LLSD const & chat_data) void LLFloaterIMNearbyChatListener::listenChat(LLSD const &chat_data) { - mReplyPumps[chat_data["coro_name"].asString()] = chat_data["reply"].asString(); + mReplyPumps[LLCoros::getName()] = chat_data["reply"].asString(); } void LLFloaterIMNearbyChatListener::stopListeningChat(LLSD const &chat_data) { - mReplyPumps.erase(chat_data["coro_name"].asString()); + mReplyPumps.erase(LLCoros::getName()); } diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp index d8e53f3e69..97779a12ad 100644 --- a/indra/newview/llluamanager.cpp +++ b/indra/newview/llluamanager.cpp @@ -128,7 +128,7 @@ lua_function(post_on, "post_on(pumpname, data): post specified data to specified LLSD data{ lua_tollsd(L, 2) }; lua_pop(L, 2); LL_DEBUGS("Lua") << "post_on('" << pumpname << "', " << data << ")" << LL_ENDL; - LLEventPumps::instance().obtain(pumpname).post(data.with("coro_name", LLCoros::getName())); + LLEventPumps::instance().obtain(pumpname).post(data); return 0; } |