diff options
| author | Mike Antipov <mantipov@productengine.com> | 2009-11-18 17:27:21 +0200 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2009-11-18 17:27:21 +0200 |
| commit | f3e576eda24ab363ee280e52ae7fc3cdd2107321 (patch) | |
| tree | 61b380d935fe285699f23896c555cf4a242dd483 /indra/newview/llimview.cpp | |
| parent | fce52249abdba7a865f03c88692a45e8ff972763 (diff) | |
| parent | 0688ae8c51d1c6d79ed30bb10ad049fd5ce790ef (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index dc32291714..dd78bb631f 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -49,6 +49,7 @@ #include "llbottomtray.h" #include "llcallingcard.h" #include "llchat.h" +#include "llchiclet.h"
#include "llresmgr.h" #include "llfloaterchat.h" #include "llfloaterchatterbox.h" @@ -1194,7 +1195,7 @@ BOOL LLIncomingCallDialog::postBuild() // check to see if this is an Avaline call LLUUID session_id = mPayload["session_id"].asUUID(); - bool is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(session_id);
+ bool is_avatar = LLVoiceClient::getInstance()->isParticipantAvatar(session_id); childSetVisible("Start IM", is_avatar); // no IM for avaline LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name"); |