Commit Graph

136 Commits (1a437cbedf94de90d749f426dde09f2466693de2)

Author SHA1 Message Date
Andrey Kleshchev 1b369c7f10 Merge branch 'master' (DRTVWR-543) into DRTVWR-483
# Conflicts:
#	indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
Andrey Lihatskiy 9a1af101cd Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
Andrey Lihatskiy 981cdca0a5 Merge branch 'master' into DRTVWR-483
# Conflicts:
#	indra/llui/lltextbase.h
#	indra/newview/VIEWER_VERSION.txt
2021-11-16 01:34:29 +02:00
Mnikolenko Productengine ceb752c133 SL-11690 Parse URLs in Group description and Land description 2021-08-13 16:05:32 +03:00
Mnikolenko Productengine a74cadff83 SL-14149 FIXED The text is displayed black after double-clicking on it 2020-10-23 16:05:31 +03:00
Andrey Lihatskiy 42330f2008 Merge branch 'master' into DRTVWR-483 2020-10-14 22:01:05 +03:00
Andrey Lihatskiy dcb6b5489d Merge branch 'master' into DRTVWR-483 2020-03-18 21:06:02 +02:00
Andrey Lihatskiy 9ec2aac56c Merge branch 'master' into DRTVWR-482 2020-03-18 21:05:33 +02:00
Andrey Lihatskiy d956c866cf Merge branch 'master' into DRTVWR-483 2020-02-05 18:33:53 +02:00
Andrey Lihatskiy 258cc9c61a Merge branch 'master' into DRTVWR-482 2020-02-05 18:31:06 +02:00
Brad Payne (Vir Linden) 38649767a0 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into DRTVWR-481
Merge
2020-01-28 21:47:35 +00:00
andreykproductengine b611925357 SL-12484 EXP-696 Remade "Remember Password" checkbox to be multiline 2020-01-02 22:19:21 +02:00
maxim_productengine 3d5ffd0af3 SL-12003 FIXED Viewer Icons do not display in Profiles 2019-12-02 16:28:13 +02:00
maxim_productengine 4acfc99fa6 SL-12317 UI Changes to Group limits 2019-11-22 18:26:56 +02:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
AndreyL ProductEngine 3175525950 Merged in lindenlab/viewer-release 2019-05-08 21:41:56 +03:00
AndreyL ProductEngine 93f0023efa Merged in lindenlab/viewer-release 2019-05-08 21:41:11 +03:00
andreykproductengine 580b35c8ea SL-307 Display in-viewer all warning messages logged by the mesh uploader 2019-04-01 20:22:25 +03:00
Kadah_Coba 3dea03ed4a Added LLTextBase::setParseHTML 2019-03-02 23:34:31 -08:00
AndreyL ProductEngine 09b750483a SL-10293 Firestorm PR: preferences and menu search 2019-01-03 22:59:49 +02:00
andreykproductengine b7c909367e MAINT-7267 Fixed UI missing last symbol of string on hi-res monitors. 2017-04-06 21:29:43 +03:00
andreykproductengine 8ef99c38a5 MAINT-918 Newline was not displayed correctly in chat window. 2017-01-04 18:38:52 +02:00
andreykproductengine ff118b7d21 MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase 2016-09-12 17:45:12 +03:00
andreykproductengine efa716b5fc MAINT-2129 "Block" button doesn't become disabled 2016-05-18 19:29:31 +03:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
andreykproductengine 230fc28d8a MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu 2016-03-11 20:16:03 +02:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
andreykproductengine c73d9e5c44 MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0 2015-12-29 20:20:40 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden 69ff937e47 merge changes for 3.8.5-release 2015-10-13 08:43:03 -04:00
Mnikolenko ProductEngine 4ab4c6da02 MAINT-5463 FIXED Add hovertext to the official link badge in chat/IM, etc. 2015-08-10 11:15:50 +03:00
Oz Linden d6f7a16a68 merge changes for 3.7.26-release 2015-03-23 22:39:18 -04:00
Jonathan Yap 2d7fb5c675 STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made 2014-12-28 09:34:28 -05:00
maksymsproductengine 61e05f9125 MAINT-4170 Eliminate homoglyphs in URL hostnames: used 3p-uriparser; 2014-09-22 20:01:55 +03:00
andreykproductengine 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
simon bfa42c9e28 Merge downstream code and become 3.7.12 2014-07-07 16:17:53 -07:00
Cinder 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
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
maxim@mnikolenko 72dba8742c MAINT-4070 FIXED Use icon in urls when content is trusted. 2014-05-28 13:20:12 +03:00
maksymsproductengine 8b86130f25 MAINT-3967 FIXED Up arrow key does not move the cursor up in chat field. 2014-05-07 18:42:24 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -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
Richard Linden 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
Richard Linden 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
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden 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
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
Richard Linden 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