livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,051 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

31 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 
# Conflicts:
#	.gitignore
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llwindow/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/viewer_manifest.py
 2023-03-21 10:57:56 +01:00
Ansariel 68c04f41ad Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/viewer_manifest.py
 2022-12-19 22:59:03 +01:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Ansariel 2b65ae8215 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-15 17:33:22 +02:00
Andrey Kleshchev 2e52d921bf SL-16156 LLTrace::StatType crash 
Don't record stats or run timer when making 360 snapshots.
 2022-10-13 01:10:49 +03:00
Ansariel 0e325eab28 Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/Python.cmake
#	indra/llcommon/llsd.h
#	indra/llcommon/llstl.h
#	indra/llinventory/llparcel.cpp
#	indra/llmessage/llmessagethrottle.cpp
#	indra/llui/lldockablefloater.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloater360capture.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llwatchdog.cpp
#	indra/newview/viewer_manifest.py
 2022-09-17 14:37:33 +02:00
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07:00
Ansariel 2507bc6137 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-09-15 20:37:16 +02:00
Ansariel 7d0d744e34 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/featuretable_linux.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloatertranslationsettings.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerwindow.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2022-09-13 19:37:45 +02:00
Andrey Kleshchev 0fa8fbc4a7 SL-16156 Fix exit crash in 360 snapshot floater 2022-09-08 22:58:55 +03:00
Ansariel 2f42e999e0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llhudtext.cpp
#	indra/newview/llpanelpicks.cpp
#	indra/newview/llpanelprofile.cpp
 2022-08-31 16:04:49 +02:00
Nat Goodspeed 2dc4aec993 DRTVWR-568: Eliminate more blockers to C++17 language standard. 2022-08-26 17:21:01 -04:00
Beq 90b964a61f FIRE-31942 - Disable CoRo for 360 by default to avoid heap corruption 2022-08-26 19:48:42 +01:00
Ansariel 5dda6abee7 Fix invalid default value for 360QualitySelection and restore last quality setting since LL UX/UI obviously has no clue 2022-08-15 14:53:35 +02:00
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel dbd7ecc9a4 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-02-02 12:56:43 +01:00
Ansariel 828fbdc571 Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer 2022-02-02 10:37:33 +01:00
Mnikolenko Productengine 257f75d7a3 SL-16638 don't allow downloading files from the built-in browser 2022-02-01 23:57:48 +02:00
Mnikolenko Productengine a4431fe12f SL-16638 don't allow downloading files from the built-in browser 2022-01-14 15:37:18 +02:00
Ansariel 1edfb172f5 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llfilesystem/lldiskcache.h
#	indra/newview/app_settings/settings.xml
 2022-01-12 16:46:56 +01:00
Andrey Kleshchev 12a97d50bf SL-15943 Snapshot 360 floater should refresh on hotkey 
Ctrl+shift+alt+S should refresh the snapshot if floater is already open
 2022-01-11 23:49:21 +02:00
Ansariel 9dc7f0a1f0 Fix loading from wrong skin directory 2021-11-16 12:21:32 +01:00
Mnikolenko Productengine a1fcaa3898 SL-15944 Don't show animeshes and local lights attached to the avatar when ‘Hide all avatars' is enabled 2021-09-06 19:53:43 +03:00
Callum Prentice 56dc2643f2 SL-15935 The particles attached to the avatar are shown in 360 snapshot when the ‘Hide all avatars' option is enabled - Fixed 2021-09-02 11:26:58 -07:00
Mnikolenko Productengine dc3e00a495 SL-15934 use llofstream to handle folder names correctly 2021-09-02 17:35:51 +03:00
Mnikolenko Productengine d41dd19f18 SL-15934 fixed issue with saving image to the folder with non-ascii name 2021-09-02 16:34:30 +03:00
Mnikolenko Productengine 27c9e0347f SL-15933 FIXED crash in capture360Images() 2021-09-02 13:33:09 +03:00
Callum Prentice 3648447235 SL-15918 Experimental feature to perform multiple render passes and reduce missing content - fixed 2021-08-30 19:51:25 -07:00
Callum Prentice cfb355ab23 SL-15899: Do not use power of 2 reduction for 360 capture size when deferred rendering is off - completed 2021-08-27 14:53:43 -07:00
Mnikolenko Productengine 03502fa497 DRTVWR-534: Use minimum Viewer window dimension as image size when deferred rendering is off 2021-08-27 19:55:49 +03:00
Callum Prentice 0c89e67eb5 DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one. 2021-08-20 08:28:48 -07:00