a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
a8446ac624
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-24 21:52:26 +01:00
d571aecd01
This reverts commit 3be882c1c6 - Not compatible with LL's version of curl (too old).
2024-03-03 00:12:16 +11:00
45dc1a63f0
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
2024-01-12 14:18:34 +01:00
7c8907522f
replace boost library to standard
2024-01-08 23:29:21 +02:00
0a928bf1fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
2023-10-04 11:38:21 +02:00
3be882c1c6
CURL - The use of CURLINFO_SIZE_DOWNLOAD and CURLINFO_SPEED_DOWNLOAD has been deprecated since curl version 7.55 (2017). The respective replacements are CURLINFO_SIZE_DOWNLOAD_T and CURLINFO_SPEED_DOWNLOAD_T. Please see https://curl.se/libcurl/c/CURLINFO_SIZE_DOWNLOAD_T.html and https://curl.se/libcurl/c/CURLINFO_SPEED_DOWNLOAD_T.html for more information. CURLINFO_SIZE_DOWNLOAD_T and CURLINFO_SPEED_DOWNLOAD_T are NOT something new; the LL implementation of how curl is being used is just old... This commit will correct the deprecation warnings when compiling with newer versions of curl on Linux. In 10 years time when LL finally update curl and openssl for the other platforms, this commit can probably go away.
2023-10-02 22:38:54 +11:00
d73437c367
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-04 13:07:30 +02:00
503baf7013
Curl library expects C style strings for params
2023-07-01 15:25:57 +10:00
fc438607d2
We have a constant for this
2023-06-30 09:26:06 +02:00
8ac1af4aca
Set CURLOPT_USERAGENT in requests (instead of leaving it blank)
2023-06-30 00:16:23 +10:00
c5d9c3c2a7
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
2022-06-03 15:07:06 +02:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05:00
98d2f30dff
Do not ask for compression when using libcurl >= 7.81 due to the AWS CDN returning an invlid Content-Encoding header
2022-02-21 00:37:35 +01:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
32cb17e3bb
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# indra/newview/llgroupmgr.cpp
2020-09-28 22:24:12 +03:00
738a651efa
Fix line endings
2020-09-23 17:53:31 +03:00
25a1869ce9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 13:49:04 +02:00
5328e5ed11
Merge LL
2020-09-20 20:25:42 +02:00
81553d1b8c
SL-13919 SSL verification should take mVerifyPeer flag into account
2020-09-09 22:09:39 +03:00
98129be5ef
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:45:05 +02:00
71f6b139f8
SL-13348 Thread crashing singleton #1
2020-05-29 20:10:55 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
82e5f6c24f
SL-12421 Viewer's certificate validation does not reject connections
2020-03-04 19:13:55 +02:00
c764079389
Merge viewer-neko
2019-02-14 21:21:38 +01:00
d785c87d62
SL-2364 Fixed Viewer Caches Login Host DNS Entries Indefinetely
2019-01-29 21:33:31 +02:00
e7715f7a31
Merge Firestorm LGPL
2017-11-30 20:33:07 +01:00
409c001755
Fix FSData to download files only if there are newer versions on the server
2017-11-29 22:22:44 +01:00
32cbc9f98b
Merge viewer64
2017-11-05 12:46:02 +01:00
ead19aa22c
MAINT-7081: Only request HTTP2 with $VIEWERASSET override (testing)
2017-10-24 15:57:36 -04:00
96ac49c3e2
MAINT-7081: Merge from lindenlab/viewer64.
2017-10-24 11:22:49 -04:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
6b508cd9d4
MAINT-7081: Eliminate unused variable errors after new refactoring.
...
The new helper functions check_curl_easy_setopt() and
check_curl_multi_setopt() encapsulate the pervasive idiom:
code = curl_{easy,multi}_setopt(handle, option, arg);
check_curl_{easy,multi}_code(code, option);
But since each of these helper functions contains its own local CURL{,M}code
variable 'code', having a caller-scope variable reused for every such call is
no longer necessary -- in fact is no longer used at all. That produces a fatal
warning with MSVC. Get rid of those now-unused variables.
2017-09-30 22:05:21 -04:00
586d697475
MAINT-7081: Try requesting HTTP/2 when a request wants pipelining.
2017-09-29 17:06:42 -04:00
c47b8c27ba
Merge Firestorm LGPL
2017-08-23 17:53:48 +02:00
13b6febd34
Merge viewer-64
2017-08-16 20:22:58 +02:00
79856e6554
MAINT-7634: Feedback from code review, move enum to string converter to own function.
2017-08-14 14:54:58 -07:00
1038633526
MAINT-7634: Logging and instrumentation canges to narrow down viewer crashes.
2017-08-08 09:04:32 -07:00
57d5744f2c
MAINT-7634: Move StatsAccumulator into llcommon, collect data sent and error codes from core.
2017-07-28 14:07:25 -07:00
f2e98838a4
MAINT-7495 Viewer retries too many time apon 504 from login.cgi
2017-07-24 17:06:12 +03:00
1a5fa01fb8
MAINT-7495 Viewer retries too many time apon 504 from login.cgi
2017-07-24 17:06:12 +03:00
31be233b66
Merge viewer-lynx
2016-12-15 09:46:35 +01:00
dcff9513f1
MAINT-6978 Proxy should not be initialized outside of startLLProxy()
2016-12-13 20:29:07 +02:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
cb0017e821
Merge.
2016-02-29 14:23:07 +01:00
Ansariel