diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-28 18:30:38 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-28 18:30:38 -0700 |
| commit | c767354a204a7618e7ceb3650a0516dcde519a8d (patch) | |
| tree | 6b258169b67cc4986814ba0f5901760038c539d7 /indra/newview/llchathistory.cpp | |
| parent | 6c45b3677ee06cd58056447a4b7b45fa78df8b74 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merging viewer release
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 0f138873ac..af3c6eff11 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -628,6 +628,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) editor_params.enabled = false; // read only editor_params.show_context_menu = "true"; mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); + mEditor->setIsFriendCallback(LLAvatarActions::isFriend); } LLSD LLChatHistory::getValue() const |