51e318fd8d
SL-14541 Pull in updated zlib-ng
...
Nicky Dasmijn's contribution for zlib-ng Linux builds
2022-03-05 11:34:13 +02:00
0bef5e553e
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
...
This reverts commit 8215fff0c2
2022-01-21 19:13:28 +02:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
442abdaac7
SL-16438 Machine id for Linux is always 0
2021-12-03 00:49:33 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
bbd5a9c62b
SL-16021 FIXED impostors are creating full detailed shadows
2021-09-17 15:29:00 +03:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
bc61c20560
SL-14702: Spruce up README
2021-08-02 10:10:14 -07:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
0ca16a1f95
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
2021-06-25 01:02:04 +03:00
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
6baaef4ee2
Add in the JIRA (SL-15398) describing the contribution from FS:Ansariel to the contributions.txt file
2021-06-14 11:10:22 -07:00
e7cbd00d64
Fix for SL-15382 Update contributions text file in Viewer
2021-06-10 16:51:23 -07:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
1639e1ceb4
Merge branch 'master' into DRTVWR-527-maint
2021-06-07 21:04:54 +03:00
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
ed78b2b938
SL-15234 Fix for linux build of 3p-uriparser by NickyD
...
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-07 20:57:43 +03:00
0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +03:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03: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
b58c15b1bd
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
2021-04-16 15:34:41 -07:00
56eda0385e
SL-13395 Allow creating outfit folders under My Outfits
2021-04-16 20:37:02 +03:00
8215fff0c2
SL-14717 Ability to trigger left clicks (and more) on animesh objects
...
Contribution by Rohacan Hirons
SL-14717 Follow ups
SL-14717 Using the cached setting in LLToolPie::handleHover()
2021-04-06 23:24:38 +03:00
c0f28ae362
SL-14927 Some avatar names not resolving
2021-03-18 23:01:04 +02:00
43fbd41bfd
Revert "SL-14939 Fixed the log spam"
...
This reverts commit b1ab29eeb6
2021-03-09 21:57:41 +02:00
3067f56b1f
Revert "SL-14940 Fixed ignoring custom cache path"
...
This reverts commit 8874647858
2021-03-09 21:57:32 +02:00
ada8ad1bc2
SL-14940 Fixed ignoring custom cache path
2021-03-04 12:49:48 +02:00
87908bab6d
SL-14939 Fixed the log spam
2021-03-04 12:23:57 +02:00
925feaaf95
SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.
2021-03-04 12:06:12 +02:00
8874647858
SL-14940 Fixed ignoring custom cache path
...
fix by Ansariel (https://vcs.firestormviewer.org/phoenix-firestorm/changeset/dace23b988af90a65ef57b0b9f540fc48d439dc3 )
2021-03-03 19:33:02 +02:00
Andrey Kleshchev