57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
cfb6ca569b
SL-15168 Viewer side functionality for guidebook window opening
2021-05-06 02:46:42 +03:00
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
c54382b760
Merge branch 'master' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
2021-04-29 20:04:33 +03:00
6da0a6873b
Merge branch 'SL-14862' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llstartup.cpp
2021-04-22 18:26:54 +03:00
3780c86538
SL-15028 Move guidebook code into own flaoter
...
To help with dispatcher and unify code
2021-04-16 01:24:29 +03:00
669dd6adbe
SL-14906 Open Guidebook floater on first login
2021-04-15 01:23:29 +03:00
8772aed531
SL-15013 Block List very often is empty when I log in
...
It looks like these messages were often getting lost.
These requests have higher, more visible impact if lost, so doubled retries.
As per Ansariel's suggestion moved request to a less busy stage.
2021-04-13 22:48:11 +03:00
645cf6a5d2
Merge branch 'master' into DRTVWR-519
2021-04-01 17:14:24 -07:00
3cad30d9ee
Merge branch 'master' into DV525-merge-6.4.18
2021-04-01 14:49:07 -06:00
4c889f7e52
Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
2021-04-01 21:34:44 +03:00
6240168f24
Merge branch 'master' into DRTVWR-515-maint
2021-04-01 20:45:06 +03:00
e48ce28278
SL-14936 Do not create a saved outfit automatically for new users
2021-03-16 20:32:50 +02:00
92a17bf53b
SL-14862 - tab logging
2021-03-10 17:49:06 +00:00
303feae305
Merge branch 'master' v6.4.17 into DRTVWR-525
2021-03-10 09:34:16 -07:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
9a36df5763
Merge branch 'master' into DRTVWR-514-keymappings
2021-03-09 21:59:14 +02:00
bb17e4b78e
Merge branch 'master' into DRTVWR-515-maint
2021-03-09 21:56:14 +02:00
a68c527eae
Merge branch 'master' into DRTVWR-518-ui
2021-03-09 21:55:37 +02:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
363bc9d9d0
Merge branch 'master' v 6.4.15 into DRTVWR-525
2021-03-02 14:25:36 -07:00
9c8bc82ce6
Merge branch 'master' into DRTVWR-518-ui
2021-03-02 21:41:46 +02:00
35550e36db
Merge branch 'master' into DRTVWR-515-maint
2021-03-02 21:41:26 +02:00
f271ba3277
Merge branch 'master' into DRTVWR-514-keymappings
2021-03-02 21:41:13 +02:00
dd887e24d5
SL-14342 FIXED Crash: "Uninitialized param singleton LLVoiceClient"
2020-11-17 14:15:06 +02:00
ac3db22abc
Merge branch 'master' into DRTVWR-518-ui
2020-11-13 18:27:29 +02:00
0bba892bb0
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
21e2f3e974
Merge branch 'master' 6.4.12 into DRTVWR-510
2020-11-11 15:43:06 -07:00
9b1d9150c2
Merge branch 'master' into DRTVWR-519
2020-11-11 13:22:35 -08:00
8aa41b9e1c
SL-14203 add menu items to open Linden Homes and Premium Membership web pages
2020-11-06 19:41:21 +02:00
f22c85cb41
SL-13424 Add Rad Games Tools local Telemetry profiler support
2020-10-15 23:33:13 -07:00
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
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
38faec3b11
Merge branch 'master' into DRTVWR-519
2020-09-22 13:07:39 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
be48bee98f
SL-13835 Fixed warning for certificate
2020-08-27 13:01:19 +03:00
b856745048
SL-13835 SSL verification should not crash on invalid certificate
2020-08-21 20:14:35 +03:00
18428e768d
SL-12905 Use TLS-enabled map server
2020-08-19 19:09:53 +03:00
a9885029cf
Merge branch 'master' into DRTVWR-507-maint
2020-08-18 19:11:34 +03:00
f29ac6757c
Merge branch 'master' into DRTVWR-507-maint
2020-08-11 01:35:04 +03:00
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
07c7506b1b
Merge branch 'DRTVWR-476' into DRTVWR-501-maint
2020-08-05 09:59:41 +03:00
6bafe47e5c
Revert part of SL-11216 due to reverting VVM
...
This reverts commit 31d9930a0f
2020-07-30 14:36:39 +03:00
f77a30f740
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# autobuild.xml
2020-07-21 11:30:48 +03:00
7bbf3f5f7f
Merge branch 'master' into DRTVWR-501-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/llimprocessing.cpp
2020-07-20 22:24:10 +03:00
b8127f80c7
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/llcommon/llkeybind.cpp
# indra/llcommon/llkeybind.h
2020-06-24 00:08:35 +03:00
d202f460e2
SL-12085 Debug log for show() and PeekMessage
...
User's viewer freezes right after setStartupState( STATE_LOGIN_CLEANUP ) and these places are primary suspects
2020-06-17 00:08:25 +03:00
Callum Prentice