75aa83aab6
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/lltemplatemessagedispatcher.cpp
# indra/newview/llappviewer.cpp
2024-07-06 12:42:19 +02:00
1296afd96a
Reduce LLSD::Binary temporaries
2024-07-05 02:56:25 -04:00
591c75ebaf
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
c95b4bf3ea
Post-merge - trim trailing whitespace
2024-06-10 20:45:59 +03:00
4a5b1c1bc5
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLAddBuildTest.cmake
# indra/llcommon/lluuid.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llmessage/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscripteditor.h
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvoavatar.cpp
# indra/test/CMakeLists.txt
# indra/test/test.cpp
2024-04-12 03:28:00 +02:00
17e1f3692c
Port from JsonCPP to Boost.Json for json parsing and serializing ( #1054 )
2024-04-06 02:03:58 +03:00
4b923d4291
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .github/workflows/build.yaml
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llappviewer.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
2023-08-24 20:48:55 +02:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
21a8eddf25
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-05-18 15:14:26 +02:00
2dca661b6a
SL-19676 - more IL control, added Reset Interest List Debug menu command
2023-05-15 23:24:00 +01:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07: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
1966d837e1
jsoncpp includepath should not include json/. jsoncpp includes a header "features.h"
...
which has the same name as a glibc header, allowing this header to be found without any prefix
will lead to head conflicts when there is a '#include "features.h"'
As a result all json headers need to be included via #include "json/reader.h"/"json/writer.h"
2022-04-18 02:50:43 +02:00
b6841d75c2
SL-17219 WIP - Texture pipeline overhaul
2022-04-15 19:02:07 -05: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
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
6b6b116fd4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-03-03 00:20:02 +01:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -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
6e340961c0
Merge viewer-neko
2019-10-30 18:05:01 +01:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
13b6febd34
Merge viewer-64
2017-08-16 20:22:58 +02:00
1038633526
MAINT-7634: Logging and instrumentation canges to narrow down viewer crashes.
2017-08-08 09:04:32 -07:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
0c6e79a61d
Do not add include/json/, include/jsconcpp/ directly into the include path, rather clients have to include like "json/reader.h". This is necessary as those directories contain a file features.h, which also under Linux is a system header. This will lead GCC to pick up the wrong features.h (the one from json).
2017-01-16 16:06:11 +01:00
fd2ccb1606
merge changes for 4.1.2-release
2016-11-16 09:52:59 -05:00
7df153e352
further tone down http error response logging; not all http error responses are unexpected or will cause problems
2016-08-18 18:13:41 -04:00
1e521a042c
Merge Firestorm LGPL
2016-08-10 21:25:45 +02:00
9de9b58013
Add FSCoreHttpUtil to the project
2016-08-06 16:54:22 +02:00
d49786eb02
tone down http error response logging
2016-07-21 14:44:11 -04:00
54ad513fcb
Merge viewer-bear
2016-06-24 11:35:43 +02:00
9e1c533805
Backed out changeset 8db8aca9022a (Remove temporary HttpRequestPumper eventnames from mainloop eventpump) to make room for LL fix
2016-06-24 11:29:45 +02:00
d161651cdb
MAINT-6521: Allow anonymous connections to bypass the dependency and order tracking.
2016-06-23 15:03:39 -07:00
4f99e217d3
Remove temporary HttpRequestPumper eventnames from mainloop eventpump
2016-05-24 18:50:42 +02:00
6c9b06104b
Merge viewer-bear
2016-04-27 09:04:48 +02:00
4d9dd3271b
MAINT-6338: Add methods for getting and setting boolean properties from gSavedSettings in the HTTPCore. Use those methods to access new key HTTPLogBodyOnError. Dump body of HTTP message to log in case of error if this key is true.
2016-04-25 12:06:33 -07:00
d5cc5dcd69
Merge.
2015-11-04 12:18:39 +01:00
bd646490c9
Move FS specific functions into their own files.
2015-11-04 10:48:49 +01:00
d64ddb54ca
MAINT-5820: Add a success/failure result to HTTP body parse method and react to that rather than an "undefined" LLSD
2015-11-03 14:22:42 -08:00
482cbfee70
- Option to send http header via the callback* methods.
...
- Method to create a header with If-Modified-Since.
2015-11-02 17:57:51 +01:00
67870a49d7
Firestorm specific download/post functions to download general web content and not only llsd+xml
2015-10-31 18:38:19 +01:00
bbb9d4f21b
MAINT-5732: Change to the way event polling handles error conditions and cancel calls.
...
Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr
Started minor refactor in the materials manager into coroutines (unfinished)
2015-10-14 17:46:24 -07:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
1356be0fe9
MAINT-5691: Browser was using deprecated outbox display type AND not correctly returning error body to application.
...
LLCore:HTTP now will provide and LLSD translation of the message body when possible in the case of an error HTTP result
VMM alert boxes now use type="alertmodal" rather than "outbox"
2015-10-07 16:09:08 -07:00
edd23c42fa
MAINT-5693: Consolidated the avatar appearance request into a coroutine. If the request fails because of a stale COF, then rerequest with the corrected one.
2015-10-06 14:17:37 -07:00
75c6549fde
Set consistent terminology for yield/wait -> suspend for coroutines.
2015-09-18 11:39:22 -07:00
97236a42ca
MAINT-5507: Remove HTTPClient and related cruft.
2015-09-14 11:15:23 -07:00
6a204b1bdd
MAINT-5575: Finished converting experience cache to singleton
...
MAINT-4952: Coverted VMM to coroutines
2015-09-10 16:48:01 -07:00
Ansariel