diff options
author | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
commit | 66bf21c32d64422f9fdc56161acc83b53923735b (patch) | |
tree | bdd1e565308fb97d7b8b2c97f9cd16489a1b285d /indra/newview/lltoastnotifypanel.cpp | |
parent | dc5960d3930efa482b7de205fc9b8d08785da4c8 (diff) | |
parent | 657944cda7228ba824239d94b270160ac0460934 (diff) |
merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'
Diffstat (limited to 'indra/newview/lltoastnotifypanel.cpp')
-rwxr-xr-x | indra/newview/lltoastnotifypanel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 602c701a33..98ed2f0fc4 100755 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -46,7 +46,7 @@ const S32 BOTTOM_PAD = VPAD * 3; const S32 IGNORE_BTN_TOP_DELTA = 3*VPAD;//additional ignore_btn padding S32 BUTTON_WIDTH = 90; -// *TODO: magic numbers(?) - copied from llnotify.cpp(250) +// *TODO: magic numbers - copied from llnotify.cpp(250) const S32 MAX_LENGTH = 512 + 20 + DB_FIRST_NAME_BUF_SIZE + DB_LAST_NAME_BUF_SIZE + DB_INV_ITEM_NAME_BUF_SIZE; |