Andrey Kleshchev
|
f655bb1f27
|
Merge branch master (DRTVWR-515) into DRTVWR-483
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
|
2021-05-06 22:13:40 +03:00 |
|
Andrey Lihatskiy
|
42330f2008
|
Merge branch 'master' into DRTVWR-483
|
2020-10-14 22:01:05 +03:00 |
|
Andrey Lihatskiy
|
b39ad7724f
|
Merge branch 'master' into DRTVWR-515-maint
|
2020-10-14 22:00:20 +03:00 |
|
Andrey Lihatskiy
|
1d458de949
|
Merge branch 'master' into DRTVWR-515-maint
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
|
2020-09-28 22:29:19 +03:00 |
|
Andrey Lihatskiy
|
f4bfaeb45e
|
Merge branch 'master' into DRTVWR-483
|
2020-09-23 01:48:13 +03:00 |
|
Andrey Kleshchev
|
730af5d488
|
Merged master (DRTVWR-503) into DRTVWR-482
|
2020-09-22 22:51:33 +03:00 |
|
Andrey Kleshchev
|
e67e9f63c3
|
SL-13293 Fixed reshape behavior for scale change
|
2020-08-14 01:06:48 +03:00 |
|
Mnikolenko Productengine
|
0828d7375a
|
SL-12396 FIXED Last line can't be removed if it was selected via triple-clicking
|
2020-05-08 11:54:58 +03:00 |
|
Andrey Lihatskiy
|
ec9b989863
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
|
2020-05-05 00:37:16 +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 |
|
maxim_productengine
|
b9f0eb54ce
|
SL-12396 Triple clicking text in a textbox / textarea should only select the current line
|
2020-02-12 12:45:56 +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 |
|
maxim_productengine
|
3d5ffd0af3
|
SL-12003 FIXED Viewer Icons do not display in Profiles
|
2019-12-02 16:28:13 +02:00 |
|
AndreyL ProductEngine
|
56056aa198
|
Upstream merge from viewer-neko
|
2019-11-27 23:20:03 +02:00 |
|
AndreyL ProductEngine
|
d0c7b4fade
|
Merged in lindenlab/viewer-release
|
2019-11-27 08:19:22 +02:00 |
|
maxim_productengine
|
4acfc99fa6
|
SL-12317 UI Changes to Group limits
|
2019-11-22 18:26:56 +02:00 |
|
AndreyL ProductEngine
|
f83ada32f7
|
Merged in lindenlab/viewer-release
|
2019-11-13 10:50:25 +02:00 |
|
AndreyL ProductEngine
|
5f731d84cb
|
Downstream merge from 494-maint-wassail
|
2019-11-12 02:37:15 +02:00 |
|
andreykproductengine
|
98b28e5881
|
SL-11910 [Win] Horizontal scroll
|
2019-09-10 19:49:15 +03:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +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
|
9d2cb130e3
|
SL-11028 [Legacy Profiles] Selection in account field is malfunctioning
|
2019-04-25 23:03:18 +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 |
|
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 |
|
Mnikolenko Productengine
|
eddcb43851
|
MAINT-7224 Chat logs move down, leaving huge empty space
|
2017-03-21 16:18:23 +02:00 |
|
andreykproductengine
|
8ef99c38a5
|
MAINT-918 Newline was not displayed correctly in chat window.
|
2017-01-04 18:38:52 +02:00 |
|
andreykproductengine
|
da23e0f925
|
MAINT-6726 Fixed LLLineEditor menus staying in memory forever
|
2016-09-13 20:32:34 +03:00 |
|
andreykproductengine
|
ff118b7d21
|
MAINT-6720 Fixed onVisibilityChange() crash in LLTextBase
|
2016-09-12 17:45:12 +03:00 |
|
andreykproductengine
|
d37003a631
|
MAINT-2129 signuls cleanup
|
2016-05-23 18:06:16 +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
|
71a468c6fb
|
merge changes for other open sourc contributions
|
2015-07-30 11:09:00 -04:00 |
|
Mnikolenko ProductEngine
|
07020ffce0
|
MAINT-5428 FIXED Show tooltip for both parts of url.
|
2015-07-29 12:35:54 +03:00 |
|
AndreyL ProductEngine
|
e62d5ea4e8
|
MAINT-5019 FIXED Undesired "http://" added to domains sent in chat
Completely removed matching of the URLs w/o a protocol
+ Some unit tests
|
2015-07-29 07:35:08 +03:00 |
|
Oz Linden
|
034fb74d05
|
merge changes for STORM-2113
|
2015-04-14 05:39:36 -04:00 |
|
Oz Linden
|
a8ef252571
|
merge changes for 3.7.27-release
|
2015-04-13 16:23:36 -04:00 |
|
Cinder
|
5a282abe18
|
STORM-2113 - uri parsing cleanup and fixes
|
2015-04-11 15:23:06 -06:00 |
|
Oz Linden
|
d6f7a16a68
|
merge changes for 3.7.26-release
|
2015-03-23 22:39:18 -04:00 |