summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com>2009-10-27 11:28:46 +0200
committerYuri Chebotarev ychebotarev@productengine.com <Yuri Chebotarev ychebotarev@productengine.com>2009-10-27 11:28:46 +0200
commit62c8f55e3e49f55bc76dbcaba797ca02b3072c3f (patch)
treee514e155cae5f3fb0939aea9d58bab43d4a05af0 /indra/newview/llimfloater.cpp
parente4b3b5f7df55df49f1253cf5fa7bd728e1fbb094 (diff)
working on EXT-1713,EXT-1712,EXT-1711,EXT-1709
EXT-1713 Nearby Chat: Objects have tooltips (???)(???) EXT-1712 Nearby Chat: change context menu for objects EXT-1711 Nearby Chat: context menu isn't applicable for system messages EXT-1709 Nearby Chat: Avatar context menu can be triggered on avatar's icon only initial commit - panel for message headers --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index a20b5ea66c..d0d176766d 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -428,7 +428,11 @@ void LLIMFloater::updateMessages()
if (from == agent_name)
from = LLTrans::getString("You");
- mChatHistory->appendWidgetMessage(from_id, from, time, message, style_params);
+ LLChat chat(message);
+ chat.mFromID = from_id;
+ chat.mFromName = from;
+
+ mChatHistory->appendWidgetMessage(chat, style_params);
mLastMessageIndex = msg["index"].asInteger();
}