livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Andrey Lihatskiy 49dd88e86c Merge branch 'master' into DRTVWR-540-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llviewerinput.cpp
 		2021-11-19 04:45:15 +02:00
..
cmake Manually resolving conflicts after merge with DRTVWR-520 2021-11-02 22:55:55 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra
…
linux_crash_logger
…
llappearance
…
llaudio SL-14992 fmod shutdown crash 2021-11-02 12:03:10 +02:00
llcharacter
…
llcommon Merge branch 'master' into DRTVWR-540-maint 2021-11-19 04:45:15 +02:00
llcorehttp Manually resolving conflicts after merge with DRTVWR-520 2021-11-02 22:55:55 +02:00
llcrashlogger
…
llimage SL-15788 Crash throw_std_bad_alloc in LLImageRaw's scale 2021-08-09 23:55:05 +03:00
llimagej2coj
…
llinventory Revert "Merge branch 'c++17' into DRTVWR-522-maint" 2021-09-28 19:22:18 +03:00
llkdu
…
llmath SL-16263 RaiseException in LLVolumeFace::createSide 2021-10-28 01:27:18 +03:00
llmessage Manually resolving conflicts after merge with DRTVWR-520 2021-11-02 22:55:55 +02:00
llplugin SL-15867 User not logged in - very much the MVS (minimum viable solution) but by storing the OpenID cookie when it arrives then injecting it forcefully into each new media instance, it appears that the 'not logged in' problem is solved - at least in my testing, 20+ times logging in without a cache and profiles, dashboard etc. were all logged in - QA will confirm. The full solution involves providing a separate cache for each media instance and tightening up the CEF cookie calling code - that is a large project and this is sufficient for now 2021-09-02 00:05:44 +03:00
llprimitive Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 2021-09-03 00:18:26 +03:00
llrender
…
llui Merge branch 'master' into DRTVWR-540-maint 2021-11-19 04:45:15 +02:00
llvfs Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 2021-09-03 00:18:26 +03:00
llwindow Merge branch 'master' into DRTVWR-540-maint 2021-11-19 04:45:15 +02:00
llxml
…
mac_crash_logger Manually resolving conflicts after merge with DRTVWR-520 2021-11-02 22:55:55 +02:00
media_plugins SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat 2021-11-09 02:38:58 +02:00
newview Merge branch 'master' into DRTVWR-540-maint 2021-11-19 04:45:15 +02:00
test Revert "Merge branch 'c++17' into DRTVWR-522-maint" 2021-09-28 19:22:18 +03:00
tools/vstool
…
viewer_components
…
win_crash_logger Manually resolving conflicts after merge with DRTVWR-520 2021-11-02 22:55:55 +02:00
CMakeLists.txt Merge branch 'master' into DRTVWR-520-apple-notarization 2021-08-12 23:13:12 +03:00
edit-me-to-trigger-new-build.txt DRTVWR-545 New line for the coding policy check 2021-09-28 19:44:52 +03:00
fix-incredibuild.py
…