diff options
| author | simon <none@none> | 2014-01-10 13:15:19 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-01-10 13:15:19 -0800 |
| commit | cfadbe631fbf845db8e26793613dea37ef08d11c (patch) | |
| tree | 1283cd746e6a1b0d0ffc214e8cc6863f1202c226 /indra/newview/llchathistory.cpp | |
| parent | f291995dac53c2aba9d79aef8b6cd91a5c836e9f (diff) | |
Revert earlier back-out for MAINT-535 ... it's back in
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rwxr-xr-x | indra/newview/llchathistory.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 1574c9f613..abeaf958eb 100755 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -731,8 +731,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) editor_params.follows.flags = FOLLOWS_ALL; editor_params.enabled = false; // read only editor_params.show_context_menu = "true"; - // MAINT-535 reversion test - //editor_params.trusted_content = false; + editor_params.trusted_content = false; mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); mEditor->setIsFriendCallback(LLAvatarActions::isFriend); } |