diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-02-01 13:10:45 +0200 |
commit | b3641c35fe00ea93887ea8980bf69624c8299267 (patch) | |
tree | 9b575e425986b3f0496192e95009ba2297158de3 /indra/newview/lltoastalertpanel.cpp | |
parent | 2e2d65cd10a9b2664d3ce020ef7e7e4de3d6705a (diff) | |
parent | 244bef7d0cdb75f011f70d8cd834154eeb469088 (diff) |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
-rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp index da31bb3e73..c3ccb9380b 100644 --- a/indra/newview/lltoastalertpanel.cpp +++ b/indra/newview/lltoastalertpanel.cpp @@ -170,7 +170,6 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal params.tab_stop(false); params.wrap(true); params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP); - params.allow_html(false); LLTextBox * msg_box = LLUICtrlFactory::create<LLTextBox> (params); // Compute max allowable height for the dialog text, so we can allocate |