summaryrefslogtreecommitdiff
path: root/indra/newview/llnotificationmanager.cpp
diff options
context:
space:
mode:
authorLynx Linden <lynx@lindenlab.com>2010-01-28 15:38:55 +0000
committerLynx Linden <lynx@lindenlab.com>2010-01-28 15:38:55 +0000
commitfee014bd82cd78f07bcc88c45109a1ea2b2eee24 (patch)
tree83801b354031134d1fd06ac1894552021ae6afc7 /indra/newview/llnotificationmanager.cpp
parentb3e25e1fbd9cfccc0363cb436ad4302ead974859 (diff)
EXT-4693: Pass through owner ID to remote object inspector.
Plumbing to pass the owner ID for a chatting object down into the LLChatHistory::appendMessage() method where we create the objectim SLapp that will bring up the remote object inspector. Pheww. For object notifications that are displayed as text chat, we
Diffstat (limited to 'indra/newview/llnotificationmanager.cpp')
-rw-r--r--indra/newview/llnotificationmanager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnotificationmanager.cpp b/indra/newview/llnotificationmanager.cpp
index 66bc217d15..4401bb953f 100644
--- a/indra/newview/llnotificationmanager.cpp
+++ b/indra/newview/llnotificationmanager.cpp
@@ -107,16 +107,17 @@ bool LLNotificationManager::onNotification(const LLSD& notify)
}
//--------------------------------------------------------------------------
-void LLNotificationManager::onChat(const LLChat& msg,ENotificationType type)
+void LLNotificationManager::onChat(const LLChat& msg, const LLSD &args)
{
- switch(type)
+ // check ENotificationType argument
+ switch(args["type"].asInteger())
{
case NT_NEARBYCHAT:
{
LLNearbyChatHandler* handle = dynamic_cast<LLNearbyChatHandler*>(mNotifyHandlers["nearbychat"].get());
if(handle)
- handle->processChat(msg);
+ handle->processChat(msg, args);
}
break;
default: //no need to handle all enum types