diff options
| author | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
| commit | ce526d40638fcc78724913621ee5c12f792f1859 (patch) | |
| tree | 735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llchathistory.cpp | |
| parent | 34f561db55868185f0a946009f41f4f212366484 (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge with voorhees (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 |