Andrey Lihatskiy
|
35708568d6
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# indra/newview/llfloatermodelpreview.cpp
|
2020-10-14 21:58:43 +03:00 |
|
Andrey Lihatskiy
|
825cfc2b6a
|
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
|
2020-09-22 23:30:12 +03:00 |
|
Andrey Kleshchev
|
730af5d488
|
Merged master (DRTVWR-503) into DRTVWR-482
|
2020-09-22 22:51:33 +03:00 |
|
Andrey Kleshchev
|
34444a0873
|
SL-13697 Items I am wearing continue to go to lost and found
Contribution from Ansariel Hiller
|
2020-09-21 23:47:08 +03:00 |
|
Mnikolenko Productengine
|
c49565be6e
|
SL-13858 FIXED Group chat transcripts named with double (group) (group).txt after opening chat history.
|
2020-08-25 21:19:41 +03:00 |
|
Andrey Lihatskiy
|
b0274e1bdd
|
Merge branch 'master' into DRTVWR-482
|
2020-08-18 19:17:01 +03:00 |
|
Andrey Lihatskiy
|
a9885029cf
|
Merge branch 'master' into DRTVWR-507-maint
|
2020-08-18 19:11:34 +03:00 |
|
Andrey Kleshchev
|
d240d381a2
|
SL-13583 Some behavior tweaks #1
|
2020-08-12 00:59:45 +03:00 |
|
Andrey Lihatskiy
|
9406b757a3
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
|
2020-08-11 01:34:13 +03:00 |
|
Andrey Lihatskiy
|
b17e2aaff1
|
SL-13642 Updated contributions.txt
|
2020-07-22 06:48:15 +03:00 |
|
Andrey Lihatskiy
|
3c564f5afc
|
SL-11625 Fix for skewed baked texture offset values
|
2020-07-02 21:20:13 +03:00 |
|
Mnikolenko Productengine
|
9114d7a524
|
SL-13364 FIXED Viewer crashes when opening Spell Check floater when "SpellCheck" is FALSE
|
2020-06-03 15:37:08 +03:00 |
|
Mnikolenko Productengine
|
353afb48f2
|
SL-13239 Add 'Touch' to the various attachment context menus
|
2020-05-28 18:38:01 +03:00 |
|
Mnikolenko Productengine
|
ae24afec8f
|
SL-13190 Allow Edit Attached Object Position From Inventory
|
2020-05-22 14:37:14 +03:00 |
|
Andrey Lihatskiy
|
aaaf3189c4
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
|
2020-05-19 22:37:41 +03:00 |
|
Andrey Lihatskiy
|
6c79fdd695
|
Merge branch 'master' into DRTVWR-507-maint
|
2020-05-19 10:49:11 +03:00 |
|
Andrey Lihatskiy
|
63004f50e3
|
Merge branch 'master' into DRTVWR-482
|
2020-05-19 10:47:00 +03:00 |
|
Andrey Lihatskiy
|
510574dc14
|
Merge branch 'master' into DRTVWR-501-maint
# Conflicts:
# indra/llxml/llcontrolgroupreader.h
# indra/newview/llviewerkeyboard.cpp
|
2020-05-18 23:41:19 +03:00 |
|
Mnikolenko Productengine
|
e1504d8c56
|
SL-13178 Improve initial opening time of the landmarks floater
|
2020-05-05 21:09:42 +03:00 |
|
Mnikolenko Productengine
|
9c3368bbf6
|
SL-13178 Improve initial opening time of the landmarks floater
|
2020-05-05 19:08:55 +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
|
89e17d1780
|
Merge branch 'master' into DRTVWR-482
|
2020-05-04 23:39:10 +03:00 |
|
Andrey Lihatskiy
|
6364e2fff6
|
Merge branch 'master' into DRTVWR-460
|
2020-05-04 23:35:54 +03:00 |
|
Andrey Kleshchev
|
9c31597e5e
|
SL-13141 Crashfix contribution
|
2020-04-30 17:51:46 +03:00 |
|
Andrey Lihatskiy
|
a0d7d87355
|
Merge branch 'master' into DRTVWR-460
# Conflicts:
# indra/llmath/llquaternion.h
# indra/newview/lldrawpoolwater.cpp
# indra/newview/lljoystickbutton.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/textures/textures.xml
|
2020-04-26 21:57:40 +03:00 |
|
Andrey Lihatskiy
|
a4b1c0330a
|
Merge branch 'master' into DRTVWR-482
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
|
2020-04-21 13:12:05 +03:00 |
|
Andrey Lihatskiy
|
c757c29c95
|
Merge branch 'master' into DRTVWR-500
# Conflicts:
# indra/newview/pipeline.cpp
|
2020-04-20 21:23:34 +03:00 |
|
Andrey Kleshchev
|
85fb2b81d8
|
SL-11360 Viewer floods the server with GroupProfileRequest
|
2020-02-14 18:37:25 +00: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 |
|
AndreyL ProductEngine
|
d0c7b4fade
|
Merged in lindenlab/viewer-release
|
2019-11-27 08:19:22 +02:00 |
|
AndreyL ProductEngine
|
b371c5a35d
|
Merged in lindenlab/viewer-release
|
2019-10-31 21:13:12 +02:00 |
|
andreykproductengine
|
1b4d5492c6
|
SL-11727 Fix build warnings
|
2019-10-23 16:37:15 +03:00 |
|
Brad Payne (Vir Linden)
|
c7747d2a1b
|
merge
|
2019-10-16 22:24:03 +01:00 |
|
AndreyL ProductEngine
|
4921618390
|
Merged in lindenlab/viewer-release
|
2019-09-10 23:30:52 +03:00 |
|
Graham Linden
|
3609eabe54
|
Merge viewer-release 6.3.2
|
2019-09-10 12:07:01 -07:00 |
|
Graham Linden
|
a97f13e161
|
Merge viewer-release 6.3.2
|
2019-09-10 10:19:50 -07:00 |
|
Graham Linden
|
f03b696c3d
|
Merge viewe-release 6.2
|
2019-07-12 08:34:25 -07:00 |
|
AndreyL ProductEngine
|
ff536ef9c2
|
Merged in lindenlab/viewer-release
|
2019-06-29 06:37:27 +03:00 |
|
AndreyL ProductEngine
|
ad64edd9c0
|
Merged in lindenlab/viewer-lynx
|
2019-06-22 03:17:43 +03:00 |
|
AndreyL ProductEngine
|
13580377c4
|
Merged in lindenlab/viewer-release
|
2019-06-22 03:16:39 +03:00 |
|
Graham Linden
|
9313bc50c4
|
Merge the Rainbow
|
2019-06-20 13:42:00 -07:00 |
|
AndreyL ProductEngine
|
0574d03bfa
|
OPEN-345 Fixed enigmatic messages during build
|
2019-06-17 19:46:20 +03:00 |
|
AndreyL ProductEngine
|
b996c95f32
|
SL-11079 Updated contributions.txt
|
2019-05-28 23:52:23 +03:00 |
|
AndreyL ProductEngine
|
93f0023efa
|
Merged in lindenlab/viewer-release
|
2019-05-08 21:41:11 +03:00 |
|
Graham Linden
|
65cb4b6d20
|
Merge 6.2.2
|
2019-05-08 10:37:34 -07:00 |
|
Graham Linden
|
470d1595cc
|
Merge viewer-release
|
2019-05-08 09:30:39 -07:00 |
|
maxim_productengine
|
be0c609eaf
|
SL-11072 FIXED Crash in LLInventoryAction::doToSelected(2406)
|
2019-05-02 13:11:18 +03:00 |
|
Graham Linden
|
5f8cca95f8
|
Merge 6.2.1
|
2019-04-17 11:24:08 -07:00 |
|
Graham Linden
|
f14888b616
|
Merge 6.2.1
|
2019-04-17 08:43:14 -07:00 |
|
AndreyL ProductEngine
|
922793e489
|
Merged in lindenlab/viewer-release
|
2019-04-17 16:47:13 +03:00 |