Commit Graph

306 Commits (94ac0064354594de8adbb99084029c8b4027b2f6)

Author SHA1 Message Date
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
Richard Linden f07b9c2c69 renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08: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
Richard Linden cbff0e7ab8 SH-3468 WIP add memory tracking base class
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
Richard Linden 1f56e57008 SH-3468 WIP add memory tracking base class
created memory tracking trace type
instrumented a few classes with memory tracking
2012-12-18 00:58:26 -08:00
William Todd Stinson 0356ef61cf CHUI-243: Add calls the parent class's implementation for onFocusReceived() and onFocusLost() to ensure that the focus change messages are properly propagated. 2012-10-19 16:21:35 -07:00
Gilbert Gonzales 49ad7fd4b5 CHUI-410: Post code review submit, changed useLabel() to return bool instead of BOOL. Adjusted code accordingly. 2012-10-17 17:52:10 -07:00
Gilbert Gonzales 05a72687d8 CHUI-410: Now when a converation floater is focused the default text 'To <Some User>' displays only when the text input field is empty. 2012-10-17 14:55:36 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Paul ProductEngine 9ab042dd1d CHUI-196 FIXED (Chat text entry area gets resized unexpectedly with certain user display names)
- Fixed label length calculating
2012-07-06 17:49:02 +03:00
Paul ProductEngine a7831406ab CHUI-180 FIXED (Started an ad hoc IM spams log with drawtext warning)
- Don't draw TextBase context if it's empty and in focus
2012-06-27 18:52:08 +03:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Paul ProductEngine 18aabdfd3d CHUI-127 FIXED (Make chat field auto resizable)
- Replaced LLLineEditor with newly created LLChatEntry
- Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
2012-06-19 09:44:40 +03:00
Todd Stinson 32063b5999 EXP-1953: Altering the behavior of building an LLTextBase such that icons are appended in place rather than prepended out of context. 2012-06-12 16:58:59 -07:00
Kitty Barnett 80b1a2c0a8 STORM-276 Insert braces around if/for/while loops 2012-06-11 13:39:45 +02:00
Kitty Barnett 34e7226ac8 STORM-276 FIXED Squiggles overflow line editor height when font size is set to large
- Also reduced squiggle width from 6 to 4 and prevented running past the end of a word
2012-05-15 13:13:44 +02:00
Oz Linden 95090c5d1e merge changes for version 3.3.1 2012-05-08 15:51:56 -04:00
Nat Goodspeed 0249a0d1e7 Automated merge with http://hg.secondlife.com/viewer-release 2012-04-26 14:07:09 -04:00
Kelly Washington 6d3be57d33 SEC-995 FIX viewer is easily spammed to death by chat
removed a couple more unnecessary string copies from unfortunate LLSD behavior.
reviewed with simon, post review from Richard.
2012-04-25 11:26:54 -07:00
Richard Linden 4472354b54 SEC-995 FIX viewer is easily spammed to death by chat
removed unnecessary string copies from chat message handling
2012-04-23 18:48:43 -07:00
Richard Linden 11c53b444d EXP-1884 FIX Errors in navigating text when editing Landmarks and picks once a vertical scrollbar is shown
fixed horizontal scrollbar showing up in local chat
2012-02-15 18:12:26 -08:00
Richard Linden 6a6cf3aa78 EXP-1884 FIX Errors in navigating text when editing Landmarks and picks once a vertical scrollbar is shown 2012-02-10 16:35:22 -08:00
Richard Linden aa345bd8f3 EXP-1874 FIX Unexpected scrollbar in text notification 2012-02-09 17:14:37 -08:00
Kitty Barnett 9c792e3376 STORM-276 FIXED Misspellings that span multiple lines don't have their squiggly lines drawn correctly 2012-02-14 22:33:28 +01:00
Kitty Barnett c34b440fec STORM-276 FIXED Typing in an LLTextEditor freezes the viewer 2012-02-14 21:57:58 +01:00
Leslie Linden ba32b72a9e Mac build fix -- added missing enumeration from switch 2012-02-06 16:20:38 -08:00
Richard Linden e854db0645 EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
Kitty Barnett 49e0c38ee8 STORM-276 Added preferences panel 2012-02-03 19:45:00 +01:00
Kitty Barnett a9d1121977 STORM-276 Added spellcheck functionality to the LLTextEditor control 2012-02-03 15:20:34 +01:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Richard Linden cf02780ddf EXP-1513 WIP Underscore ( _ ) fails to show in first chat entry in Local Chat
cleaned up font positioning on buttons
2012-01-27 17:48:08 -08:00
Richard Linden 1b1ad93c5d EXP-1512 FIX changing UI size changes cursor position in notecards
fixed case where adding text between 2 consecutive newlines created gibberish
2012-01-03 12:21:30 -08:00
Richard Linden 0aa2c7343a EXP-1512 FIX changing UI size changes cursor position in notecards 2011-12-08 20:36:47 -08:00
Dave Parks 8a8e9ccdb6 SH-2652 Don't allocate 6000+ strings every frame 2011-11-04 16:15:05 -05:00
Seth ProductEngine aad5943ab0 STORM-1234 FIXED text editor selection which was skipping the last character in line.
Added handling of the wrapped lines case when calculating the starting position for selection.

The bug is a regression caused by the fix of STORM-320 which was dealing with calculating the position of the input cursor while navigating through the lines of text with word wrapping enabled.
2011-07-14 23:46:27 +03:00
Richard Linden 2595d53ded Automated merge with http://hg.secondlife.com/viewer-development 2011-05-25 18:14:55 -07:00
Richard Linden a8405dea54 EXP-829 FIX Text Box Alignment bug
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable

fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms


reviewed by Callum
2011-05-25 18:10:58 -07:00
brad kittenbrink b3dddbf30b Fix for error in debug build accessing beyond the end of a vector.
reviewed by davep.
2011-05-12 16:09:29 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
seth_productengine 2147889a2e STORM-320 FIXED navigation with arrow keys through the text with enabled word-wrapping. 2011-04-20 01:17:41 +03:00
Seth ProductEngine c94d687539 STORM-721 FIXED Fix for text clipping in a textbox without a scroller.
Committed on behalf of Richard Linden:
This patch makes clipping work consistently with text and embedded widgets. The widgets will only be displayed if the corresponding text they are embedded in is displayed.  There is also a new param "clip" for text widgets that can be used to disable clipping entirely.  I introduced this as a potential work around due to the fact that we *used* to assume that text was never clipped in the vertical direction unless we had scrolling turned on.  This hasn't been the case for over a year, but now we can selectively turn off vertical text clipping with (clip="false") if we have to.
2011-04-10 00:31:52 +03:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Loren Shih 6a59861bde Automated merge up from viewer-development 2010-12-07 14:56:36 -05:00
Paul Guslisty e997a09343 STORM-593 FIXED Make transparent texteditor and lineeditor
Reason: If some child of transparent LLFloater has a visible non-transparent background then this part of floater is non-transparent. As a result floater became partially transparent.

Solution: When transparent floater changes focus, iterate through its children and set corresponding (corresponding to whether control in active or in inactive floater see STORM-535) transparency value.

- Added method LLUICtrl::getCurrentTransparency. This method calculates transparency level of a control. Calculated value should be used as an alpha chennel value in case we want this control to be transparent. For now this method is used by LLFloater to adjust transparency of its children.

- Added calculating of transparecny level for: LLLineEditor, LLTextBase, LLinventoryListItem, LLScrollContainer, LLScrollListCtrl, LLAccrodionCtrlTab.

- Added method LLFlaoter::updateChildrenTransparency which updates transparency value of its children
2010-11-24 19:12:02 +02:00
Dave Parks d682394d02 merge 2010-11-11 11:23:10 -06:00
Loren Shih a5e63b1dc0 Merge 2010-11-08 12:57:26 -05:00
Dave Parks 7aff5c6ff9 Fix for crash when clicking "about land" and land has no owner or something.
Reviewed by Nyx.
2010-11-02 16:28:56 -05:00
Kyle Ambroff fa17864382 Merge with lindenlab/viewer-development 2010-10-29 19:52:01 -07:00
Vadim ProductEngine 463969116f STORM-501 FIXED Script-editor shows ERRORS in the wrong line.
LLTextBase::setCursor() sometimes failed to work properly if line wrapping was enabled.
This is a slightly optimized version of the patch made by Satomi Ahn.
2010-10-29 23:48:46 +03:00
Kyle Ambroff f940b49d0f Merge with andrew 2010-10-21 15:56:13 -07:00
Loren Shih ae5cf3cefa Automated merge up from viewer-development 2010-10-21 10:58:23 -04:00
Loren Shih 7687653871 Automated merge up from viewer-development 2010-10-20 12:18:33 -04:00
Vadim ProductEngine d97355a19f STORM-390 FIXED "Place Profile" appeared instead of "Resident Profile" after clicking on user name in a nearby chat toast.
Now clicking an avatar name opens avatar profile; clicking an object name opens object inspector.

This change rolls back the fix of STORM-358.
2010-10-19 19:55:19 +03:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Andrew Meadows ac500df89e Post-convert merge by convert_monolith.py from http://hg.lindenlab.com/brad/viewer-simconsole 2010-09-10 15:39:20 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Tofu Linden 1d89a80ba7 merge 2010-08-25 15:58:08 +01:00
Aimee Linden 97b3314200 EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile links
Icon was being inserted before any text preceding the link.

Reviewed by Richard.
2010-08-25 01:19:44 +01:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Richard Linden 9db7d6cb3d fix for sim console not staying scrolled to bottom 2010-08-24 09:41:35 -07:00
Richard Linden 5a6a792920 fix for sim console not staying scrolled to bottom 2010-08-24 09:41:35 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Andrew Dyukov 55c887225f EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
There were two problems:

1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.

- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.

Fixed this by setting style back to normal only when drawing the last part of the segment.

- Second problem was caused by unusual way of appending link to text in chat history.

Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/

--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Christian Goetze (CG) 6a1fefac22 Redo the same merge as in changeset "2026f824953f", but this time with feeeeling. 2010-08-02 16:59:20 -07:00
Richard Nelson d72a21aca1 further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Kent Quirk 19c0d6d4ea Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1 2010-07-30 10:11:55 -04:00
Andrew Dyukov b934743014 EXT-8010 ADDITIONAL FIX Fixed problems with avatar links underlining.
There were two problems:

1. Underlining broke when avatar's first and second name were on different lines.
2. There was no underline on hover for avatar miniinspector links in plaintext IM.

- First problem was caused by calling LLOnHoverChangeableTextSegment::draw() for the same segment twice- for first and second name that were
on different lines, while handleHover() was called only once. So handleHover() was called -> text was underlined -> first part of segment was
drawn underlined -> its draw set style back to normal -> second part of segment was drawn without underlining.

Fixed this by setting style back to normal only when drawing the last part of the segment.

- Second problem was caused by unusual way of appending link to text in chat history.

Changed it so that LLTextBase::appendText() now receives link not inside style params, but directly.
Also added "/inspect" ending to check in LLUrlEntryAgent::underlineOnHoverOnly().

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/833/

--HG--
branch : product-engine
2010-08-09 15:14:45 +03:00
Richard Nelson b95ad3b5ce further UI rendering performance improvements 2010-07-30 15:17:32 -07:00
Richard Linden b5a94da19b fix for vertical truncation of sidebar headers 2010-07-29 11:56:19 -07:00
Richard Linden e69f0f8a02 fix for vertical truncation of sidebar headers 2010-07-29 11:56:19 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Richard Linden b4dfa76c9d merge 2010-07-27 10:30:17 -07:00
Richard Linden 0f2f597e7a merge 2010-07-27 10:30:17 -07:00
Andrew Dyukov 4919f0b341 EXT-8010 FIXED Implemented special behaviour of avatar links.
Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00
Andrew Dyukov 0c8cddecc1 EXT-8010 FIXED Implemented special behaviour of avatar links.
Avatar links are now underlined only on hover. Also they have the same color as other links.

- Underlining text and getting it back to normal are done in handleHover() and draw() of new LLOnHoverChangeableTextSegment
class derived from LLNormalTextSegment. This class has two pointers to styles- one for style which will be used for text
on hover, and another otherwise. This special type of text segment is used if link's boolean member mUnderlineOnHoverOnly
is true. So it is URL's flag depending on which textbase adds new text segment(like it currently happens with mDisabledLink).

- Changed avatar link color in colors.xml to emphasis (because it was white before and was inconsistent with other links).

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/749/

--HG--
branch : product-engine
2010-07-26 18:10:29 +03:00