aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-07 22:31:02 -0700
committerMcCabe Maxsted2009-10-07 22:31:15 -0700
commit4bd4150d06bfd3a47bdcd2b47d388a6453980e70 (patch)
tree85df8079d8211ecf72fbec0d6947fdbea0cbf749 /linden/indra/newview/llviewermessage.cpp
parentFixed changelog error (diff)
downloadmeta-impy-4bd4150d06bfd3a47bdcd2b47d388a6453980e70.zip
meta-impy-4bd4150d06bfd3a47bdcd2b47d388a6453980e70.tar.gz
meta-impy-4bd4150d06bfd3a47bdcd2b47d388a6453980e70.tar.bz2
meta-impy-4bd4150d06bfd3a47bdcd2b47d388a6453980e70.tar.xz
Added typing info to mini-map radar
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
-rw-r--r--linden/indra/newview/llviewermessage.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 464d687..c9e0f7f 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -78,6 +78,7 @@
78#include "llfloatergroupinfo.h" 78#include "llfloatergroupinfo.h"
79#include "llfloaterimagepreview.h" 79#include "llfloaterimagepreview.h"
80#include "llfloaterland.h" 80#include "llfloaterland.h"
81#include "llfloatermap.h"
81#include "llfloaterregioninfo.h" 82#include "llfloaterregioninfo.h"
82#include "llfloaterlandholdings.h" 83#include "llfloaterlandholdings.h"
83#include "llurldispatcher.h" 84#include "llurldispatcher.h"
@@ -2547,6 +2548,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
2547 { 2548 {
2548 ((LLVOAvatar*)chatter)->startTyping(); 2549 ((LLVOAvatar*)chatter)->startTyping();
2549 } 2550 }
2551
2552 if (LLFloaterMap::getInstance())
2553 {
2554 LLFloaterMap::getInstance()->updateTypingList(from_id, false);
2555 }
2556
2550 return; 2557 return;
2551 } 2558 }
2552 else if (CHAT_TYPE_STOP == chat.mChatType) 2559 else if (CHAT_TYPE_STOP == chat.mChatType)
@@ -2558,6 +2565,15 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
2558 { 2565 {
2559 ((LLVOAvatar*)chatter)->stopTyping(); 2566 ((LLVOAvatar*)chatter)->stopTyping();
2560 } 2567 }
2568
2569 if (LLFloaterMap::getInstance())
2570 {
2571 if (LLFloaterMap::getInstance()->getIsTyping(from_id))
2572 {
2573 LLFloaterMap::getInstance()->updateTypingList(from_id, true);
2574 }
2575 }
2576
2561 return; 2577 return;
2562 } 2578 }
2563 2579