diff options
| author | simon <none@none> | 2014-01-09 10:56:44 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-09 10:56:44 -0800 |
| commit | ade7faae5802c1e68bb2b09ba9e126bbfa2cfb37 (patch) | |
| tree | 75176cac336eb01344aa8b75e8763178c23e4e22 /indra/newview/llchathistory.cpp | |
| parent | e89bda2586a8f6054b3822900aaaedf5c6934b75 (diff) | |
| parent | 6b4a35723006b7dec25b7f0677b0dae8ce88008c (diff) | |
Merge downstream -bear
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index abeaf958eb..1574c9f613 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -731,7 +731,8 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) editor_params.follows.flags = FOLLOWS_ALL; editor_params.enabled = false; // read only editor_params.show_context_menu = "true"; - editor_params.trusted_content = false; + // MAINT-535 reversion test + //editor_params.trusted_content = false; mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); mEditor->setIsFriendCallback(LLAvatarActions::isFriend); } |