diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-29 10:42:02 -0700 |
commit | 95031093c795f3a97cdc673c7b7807c944742ab8 (patch) | |
tree | 378e103331e289894bbc915b15772ac844b6ccae /indra/newview/llchiclet.cpp | |
parent | fb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (diff) | |
parent | 15687e2acd07ed3c0a56a61af982595b99dc064f (diff) |
merge changes from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 3824-3835
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r-- | indra/newview/llchiclet.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 61a60a24be..670f8717a2 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -37,7 +37,6 @@ #include "llbottomtray.h" #include "llgroupactions.h" #include "lliconctrl.h" -#include "llimpanel.h" // LLFloaterIMPanel #include "llimfloater.h" #include "llimview.h" #include "llfloaterreg.h" @@ -1398,7 +1397,7 @@ void LLTalkButton::onClick_ShowBtn() LLAvatarListItem* item = new LLAvatarListItem(); - item->showStatus(true); + item->showLastInteractionTime(false); item->showInfoBtn(true); item->showSpeakingIndicator(true); item->reshape(mPrivateCallPanel->getRect().getWidth(), item->getRect().getHeight(), FALSE); |