24eda00b2e
Merge fix #2 : Fix optional icon positioning in LLTextBase
...
Icon needs to be prepending the text if we either want it to be on the left or
the URL itself is trusted. On the other hand, only append the icon if we either
want it to be on the right side of the URL (restoring behavior prior V3.7.25)
AND if the URL itself is not trusted (we would create a duplicate trusted icon
otherwise).
2015-02-25 10:48:05 +01:00
22386b18b4
Merge LL 2.7.25
2015-02-24 21:22:32 -08:00
3a52b250e8
Add "Show transcript" option to regular avatar SLURL context menu to keep it in sync with the specialized LLNameListCtrl version
2015-02-16 12:45:16 +01:00
d6befe9028
FIRE-15416: Add "block" to the avatar name context menu in chat history using V1 chat headers
2015-01-23 12:48:09 +01:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
0d80b8f758
Fix crash when trying to open a script while FSFixCursorPosition is set to TRUE
2015-01-13 11:39:33 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
e1ce6e3d58
Merge Firestorm LGPL tip
2015-01-08 23:12:58 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
6ea75fd4b0
MAINT-4548 & MAINT-4557 FIXED build issues
2014-10-07 18:59:11 +03:00
a25748e11e
MAINT-4119 FIXED Uniquely decorate links on Second Life or Linden Lab domains
2014-10-02 18:20:10 +03:00
dd8d2b59f7
MAINT-4170 FIXED Eliminate homoglyphs in URL hostnames: converting to lowercase links without scheme
2014-09-24 23:09:30 +03:00
61e05f9125
MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser;
2014-09-22 20:01:55 +03:00
7982ae6b91
MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
...
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
b54983b605
Allow preferences to be searched.
2014-09-28 03:00:57 +02:00
208fe31200
MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
...
Reverted previous two fixes and modified LLTextBase::changeLine()
2014-08-28 19:36:47 +03:00
ae15e85e9f
MAINT-3460 FIXED Dictionary doesn't exchange the mispelled word to correct one in a special case
2014-07-08 13:07:46 +03:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
8d2e0fb3a0
STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting
2014-06-20 13:43:31 -06:00
7991fe96ec
MAINT-3475 FIXED 'windows 64bit (?) crash in LLTextBase::getDocIndexFromLocalCoord'
2014-06-20 20:26:51 +03:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
72dba8742c
MAINT-4070 FIXED Use icon in urls when content is trusted.
2014-05-28 13:20:12 +03:00
8b86130f25
MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field.
2014-05-07 18:42:24 +03:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
001621dfc2
MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2014-05-05 23:24:34 +01:00
8c39617c9a
Begin moving script editor portions of LLTextEditor to their own derived class.
...
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor
TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
2014-04-18 12:52:07 -06:00
6845d6ac31
FIRE-11045: Spell checking changes on an unmodified notecard are not identified as such
2014-09-02 13:51:42 +02:00
f166eed059
Update Search & Replace floater to latest version from Kitty Barnett (Catznip viewer)
2014-09-02 12:17:52 +02:00
bd4f4ee793
logging cleanup in support of debugging text editor problems
2014-03-19 14:17:13 -04:00
d6fdc6e68f
merge changes for 3.7.3-release
2014-03-14 16:38:12 -04:00
3ee3d4a8f4
correct logging levels (ERR causes a crash), and a minor style fix
2014-03-14 16:19:21 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
a48312b602
I shouldn't do this at night...
2014-10-29 02:26:00 +01:00
fd4ede15ca
Properly free signals in LLTextBase
2014-10-29 02:19:35 +01:00
cfadbe631f
Revert earlier back-out for MAINT-535 ... it's back in
2014-01-10 13:15:19 -08:00
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
Ansariel