Commit Graph

331 Commits (3d1ac7c0ecab604ee6600495cd7bd2488e1bc5d1)

Author SHA1 Message Date
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
simon cfadbe631f Revert earlier back-out for MAINT-535 ... it's back in 2014-01-10 13:15:19 -08:00
simon f291995dac Revert changes made for MAINT-535 to test in a release cohort. 2014-01-07 15:18:29 -08:00
Mnikolenko ProductEngine 28339afa15 MAINT-535 'trust model' is added for secondlife:// URLs in wiki style links. Chat history is marked as untrusted source now. 2013-10-22 12:47:16 +03:00
MaximB ProductEngine 3e934d5089 MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.) 2013-09-23 09:14:53 +03:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
Nicky e7bc0e6e63 BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars. 2013-08-14 01:00:41 +02:00
Kitty Barnett 1ba7d93a6a [BUG-3527] Replacing a misspelling surrounded by line break segments results in only line breaks being inserted 2013-08-12 19:34:42 +02:00
Ansariel 8e3e639388 Add request teleport option to V2 chat header context menu & avatar SLURL context menu 2014-01-29 20:23:41 +01:00
Cinders 68235b2b03 Include Add to Contact Set in menu_url_agent.xml 2013-12-26 17:33:03 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
mberezhnoy 2b8beeeff1 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Fixed "Add friend" option always being greyed out, add ability to block object via context menu in compact chat mode.
2013-06-20 12:45:22 +03:00
mberezhnoy 882ab04ef3 CHUI-809 (Right-click menu on user name in compat chat mode doesn't have "IM")
Added callback for friendship checking
2013-06-13 20:21:24 +03:00
PavelK ProductEngine 0ada8944ee CHUI-964 ADD FIX Oversized "To" input field hides actual IM text 2013-06-05 19:40:06 +03:00
Mnikolenko ProductEngine 3bbab5bb46 CHUI-957 FIXED Missing line was added. 2013-06-04 14:45:19 +03:00
Merov Linden 0b4b92cbbf Pull merge from lindenlab/viewer-release 2013-05-30 14:07:59 -07:00
simon 507ce0d84f Merge downstream code 2013-05-29 14:42:19 -07:00
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
Gilbert Gonzales 892f3cdd2c CHUI-967: fix display of % escapes in chat 2013-05-22 06:26:54 -04:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Merov Linden 043f2e0bfd Pull from viewer-release 2013-05-02 14:09:40 -07:00
Merov Linden 5cf1c9bfe1 CHUI-845 : Make changeLine() a bit more resistant to unforseen line count values (i.e. 0) and a bit more general 2013-04-24 17:26:09 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Mnikolenko ProductEngine 3c2c897cac CHUI-916 FIXED Clear mMisspellRanges if spell check is not needed. 2013-04-12 20:27:28 +03:00
prep@lindenlab.com 0f24668b0a Merged in Chui beta6+ fixes 2013-03-29 10:37:58 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maksymsproductengine da8f2ffb16 CHUI-855 FIXED Text entry bar auto expand does not resize 2013-03-28 04:52:24 +02:00
Gilbert Gonzales 04372382d6 CHUI-846 ([crashhunters] crash in LLFontGL::maxDrawableChars): Added logging for bug to further track down problem when it occurs. Need to debug further based off information. 2013-03-26 00:29:53 -07:00
prep@lindenlab.com f2948cb1eb Merge with viewer-chui 2013-03-20 17:53:51 -05:00
Simon Linden d5561a1ada Merge in viewer-beta to get CHUI code 2013-03-19 16:20:53 -07:00
merov c294c7c474 CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux 2013-03-16 16:09:50 -07:00
Don Kjer 9150757c81 More fixes for gcc-4.6 breakage 2013-03-13 21:01:50 +00:00
Nyx Linden 1586107e87 SH-3944 WIP CHUI merge fixing
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Graham Madarasz e8b8a12b73 Mods to make compile on gcc 4.6.3 work mo betta 2013-03-12 10:48:05 -07:00
Merov Linden c594e84865 Pull merge from lindenlab/viewer-chui 2013-03-12 19:40:00 -07:00
Merov Linden cb6574c905 CHUI-845 : Avoid some xml param parsing error that seems to be linked with crashers 2013-03-12 19:38:01 -07:00
Mnikolenko ProductEngine d81226f170 CHUI-809 FIXED Changes in menu items to make them consistent. Do not start IM if selected person is self. 2013-03-12 15:38:10 +02:00
mberezhnoy 5957f1da91 merge 2013-03-07 22:13:15 +02:00
mberezhnoy 8e924c8505 CHUI-823 ([CHUIBUG]Triple-clicking on the scroll back button in the CHUI causes all the conversation to be selected) 2013-03-07 13:49:29 +02:00
Mnikolenko ProductEngine 477920b138 CHUI-809 FIXED "Start IM" menu item is added 2013-03-05 15:40:31 +02:00
Mnikolenko ProductEngine 4b43672690 CHUI-751 FIXED Triple click is now handled. 2013-02-11 15:22:24 +02:00
maksymsproductengine 46294bdcac CHUI-731 FIXED Viewer crashed while deleting text from IM message 2013-02-08 19:54:34 +02:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Ansariel a9258d9510 Add enable check for remove friend option in agent slurl context menu 2013-08-28 22:41:18 +02:00
Ansariel 2d178f9863 Remove now duplicate registration of Url.SendIM commit function in LLTextBase 2013-08-28 19:26:54 +02:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Cinders 94f55ec769 FIRE-11437 - Fix chat moderator styling. Also, revert my changes to llstylemap.cpp, grab a speaker's slurl directly 2013-08-23 08:41:48 -06:00
Cinders 490f6bc1cc FIRE-11330 Part 1 - Don't style chat name slurls as html links 2013-08-21 13:12:29 -06:00
ziree 5f8833aaf6 Fix text bleeding at the top edge of scrolling text boxes. 2013-08-19 13:52:58 +02:00