f291995dac
Revert changes made for MAINT-535 to test in a release cohort.
2014-01-07 15:18:29 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
12f0f8cb72
changed over to manual naming of MemTrackable stats
...
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
053d97db1b
better memory usage for LLTrace (tighter packing of recording arrays)
...
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
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
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
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
8e3e639388
Add request teleport option to V2 chat header context menu & avatar SLURL context menu
2014-01-29 20:23:41 +01:00
68235b2b03
Include Add to Contact Set in menu_url_agent.xml
2013-12-26 17:33:03 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
8208a40412
BUILDFIX: reverted changes that attempted to automate mem track
...
stat definition as they don't work on gcc/clang
2013-07-01 18:50:51 -07:00
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
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
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
0ada8944ee
CHUI-964 ADD FIX Oversized "To" input field hides actual IM text
2013-06-05 19:40:06 +03:00
3bbab5bb46
CHUI-957 FIXED Missing line was added.
2013-06-04 14:45:19 +03:00
0b4b92cbbf
Pull merge from lindenlab/viewer-release
2013-05-30 14:07:59 -07:00
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
892f3cdd2c
CHUI-967: fix display of % escapes in chat
2013-05-22 06:26:54 -04:00
41b4374760
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
2013-05-10 17:57:12 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
043f2e0bfd
Pull from viewer-release
2013-05-02 14:09:40 -07:00
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
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
3c2c897cac
CHUI-916 FIXED Clear mMisspellRanges if spell check is not needed.
2013-04-12 20:27:28 +03:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
da8f2ffb16
CHUI-855 FIXED Text entry bar auto expand does not resize
2013-03-28 04:52:24 +02:00
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
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
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
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
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
e8b8a12b73
Mods to make compile on gcc 4.6.3 work mo betta
2013-03-12 10:48:05 -07:00
c594e84865
Pull merge from lindenlab/viewer-chui
2013-03-12 19:40:00 -07:00
cb6574c905
CHUI-845 : Avoid some xml param parsing error that seems to be linked with crashers
2013-03-12 19:38:01 -07:00
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
5957f1da91
merge
2013-03-07 22:13:15 +02:00
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
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
477920b138
CHUI-809 FIXED "Start IM" menu item is added
2013-03-05 15:40:31 +02:00
4b43672690
CHUI-751 FIXED Triple click is now handled.
2013-02-11 15:22:24 +02:00
46294bdcac
CHUI-731 FIXED Viewer crashed while deleting text from IM message
2013-02-08 19:54:34 +02:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
a9258d9510
Add enable check for remove friend option in agent slurl context menu
2013-08-28 22:41:18 +02:00
2d178f9863
Remove now duplicate registration of Url.SendIM commit function in LLTextBase
2013-08-28 19:26:54 +02:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
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
490f6bc1cc
FIRE-11330 Part 1 - Don't style chat name slurls as html links
2013-08-21 13:12:29 -06:00
5f8833aaf6
Fix text bleeding at the top edge of scrolling text boxes.
2013-08-19 13:52:58 +02:00
ab5afa556f
FIRE-11224: Introduce FSRegistrarUtils class to be able to run enabled checks from LLUI and disable context menu items in scroll lists and text areas
2013-08-06 15:03:24 +02:00
f7b82b7744
Prevent unnecessary calculations in LLNormalTextSegment::getNumChars
2013-07-28 21:47:49 +02:00
813bd3653a
Don't make excessive string copies in LLNormalTextSegment::getNumChars to avoid massive frame stalls.
2013-07-28 20:48:43 +02:00
6d2a6151f6
Remove old on-the-fly texteditor font change code that apparrently has now been implemented by LL
2013-07-23 16:36:09 +02:00
fd73af3125
Fix right-click send IM
2013-07-16 19:00:38 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
4bb3fab19e
Fix remaining linker error. Compiles and links now...
2013-06-30 13:12:41 +02:00
c7196a5d4d
Fix llui build
2013-06-26 18:11:11 -06:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
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
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
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
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
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
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -07:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
8704782bb4
Crashfix; make sure spellcheck does not run past end of string buffer.
2012-12-29 18:55:51 +01:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
cf7eb79fa7
Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-08 04:39:11 +00:00
8cef8cde8c
Set FSFixCursorPosition to false as default & added some comments about the changes in 31082 (730b485e3553)
2012-11-29 00:41:20 +01:00
c5cddceed3
Experimental fix for FIRE-2983, FIRE-3534 & FIRE-4650 for QA testing:
...
This is a modified version of the fix for FIRE-1574 and comes with an additional debug setting "FSFixCursorPosition" to disable the FIRE-1574 fix completely for QA testing
2012-11-26 23:59:13 +01:00
eb39d5d71b
Added option to not show icon for SLURL links & moved left-side icon directly in front of the link in contrast to pre-EXP-1953
2012-10-28 20:12:56 +01:00
3a9f5a553a
Added option to show icons of SLURLs on either left or right side of the link
2012-10-28 19:44:02 +01:00
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
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
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
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
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
80b1a2c0a8
STORM-276 Insert braces around if/for/while loops
2012-06-11 13:39:45 +02:00
732fc8918c
Added "offerteleport" FS SLurl command and wired it up in agent SLurl context menu
2012-09-07 18:26:19 +02:00
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
0d4ca6478f
removed spellcheck, to be replaced by LL's version
2012-07-10 23:57:05 -07:00
80be39c63a
Added new Firestorm specific SLurl command and command handler with some basic functionality:
...
* Zoom to avatar
* Teleport to avatar
* Track avatar
all from the SLurl context menu in chat and contact list
2012-08-12 19:00:20 +02:00
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
95090c5d1e
merge changes for version 3.3.1
2012-05-08 15:51:56 -04:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
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
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
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
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
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
aa345bd8f3
EXP-1874 FIX Unexpected scrollbar in text notification
2012-02-09 17:14:37 -08:00
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
c34b440fec
STORM-276 FIXED Typing in an LLTextEditor freezes the viewer
2012-02-14 21:57:58 +01:00
ba32b72a9e
Mac build fix -- added missing enumeration from switch
2012-02-06 16:20:38 -08:00
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
49e0c38ee8
STORM-276 Added preferences panel
2012-02-03 19:45:00 +01:00
a9d1121977
STORM-276 Added spellcheck functionality to the LLTextEditor control
2012-02-03 15:20:34 +01:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
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
85d9e702a6
Fixed text editors scrolling when border is visible. Causes slight overpainting on the border, but that's pretty marginal. To be revised later, hopefully.
2012-03-05 17:40:33 +01:00
6f03000abe
- internal : change the font of an LLTextBase derived control at run-time
2012-01-10 20:30:48 +01:00
5f99af5951
Merge up to 26351 / 0c99a89542b0 (FS tip).
2012-01-31 11:52:14 +01:00
22b19c797f
Prevent crash in spellchecking if indices round of words bound.
2012-01-15 04:07:12 +01:00
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
0aa2c7343a
EXP-1512 FIX changing UI size changes cursor position in notecards
2011-12-08 20:36:47 -08:00
6958381112
Merge up to 26092/6ceebf5ce17b; Branch Chat-NearbyChat from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
...
This will enable chat docking/undocking from contacts floater again.
2012-01-23 14:56:47 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
8a8e9ccdb6
SH-2652 Don't allocate 6000+ strings every frame
2011-11-04 16:15:05 -05:00
480808d5f3
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : Chat-NearbyChat
2011-10-27 16:49:31 +02:00
7768379ffb
Merged with Chat-NearbyChat head from SL-2.8
...
--HG--
branch : Chat-NearbyChat
2011-09-29 00:32:58 +02:00
a200a71ea8
- internal : reviewed for SL-3.0
...
--HG--
branch : Chat-NearbyChat
2011-09-19 23:53:06 +02:00
121978b125
- fixed : "Click here to chat" hint text doesn't dissapear when focus is given to the multiline chatbar (thankies Mistress)
...
--HG--
branch : Chat-NearbyChat
2011-09-05 23:42:25 +02:00
e6b55bafb0
- added : multi-line chat bar to the nearby chat history floater
...
--HG--
branch : Chat-NearbyChat
2011-08-20 12:39:37 +02:00
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
2595d53ded
Automated merge with http://hg.secondlife.com/viewer-development
2011-05-25 18:14:55 -07:00
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
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
a25f898703
merge
2011-05-02 14:52:12 -05:00
2147889a2e
STORM-320 FIXED navigation with arrow keys through the text with enabled word-wrapping.
2011-04-20 01:17:41 +03:00
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
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
6a59861bde
Automated merge up from viewer-development
2010-12-07 14:56:36 -05:00
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
d682394d02
merge
2010-11-11 11:23:10 -06:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
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
fa17864382
Merge with lindenlab/viewer-development
2010-10-29 19:52:01 -07:00
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
f940b49d0f
Merge with andrew
2010-10-21 15:56:13 -07:00
ae5cf3cefa
Automated merge up from viewer-development
2010-10-21 10:58:23 -04:00
a912e5b24c
Fix script editor not accepting different fonts in skinning.
2011-12-29 01:21:53 +01:00
8bd0295f3d
Performance tweaks: do not allocate strings where they can be const. Partly from davep, SH-2652.
2011-12-10 00:26:39 +01:00
a1a402bde7
Prevent clickable links from extending past the text area. From Dawa Gurbux, fixes FIRE-2983.
2011-11-11 09:57:24 -06:00
f678ff9919
Merged in spell checker branch
2011-09-18 19:37:29 +02:00
06d5fc49eb
- fixed : the first word of a line or text editor is shown as misspelled if it doesn't start with an alpha character
...
-> i.e. "/0Hello world" on the nearby chat bar would show "Hello" as being misspelled
--HG--
branch : Misc-Spellcheck
2011-09-18 15:12:32 +02:00
simon