diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:29:39 -0800 |
| commit | de23a4d92c02504fd512b2fdb151406d31ae03c0 (patch) | |
| tree | 09167a3f1a9bfd973f1167e99c1c5c8a26513299 /indra/newview/llimview.cpp | |
| parent | fb81795a2d009480482af13b536702002ed7c8f2 (diff) | |
| parent | dd9f2ca5f555d529d8f8b6168115ca3d3155fac7 (diff) | |
Merge
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"); |