9300613edc
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-06-29 21:57:31 +02:00
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
77ce594dec
Merge branch 'master' into DRTVWR-544-maint
2022-06-29 20:31:17 +03:00
d1265cda36
SL-17425 Crash when closing two dependent floaters
...
dependent_it in llfloater was not valid after dependent floater removed itself from the list
2022-05-20 01:35:40 +03:00
ae2a0b24b8
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
2022-05-05 10:00:17 +02:00
fb4aab3144
SL-17246 Fix getSharedPrt typo
2022-04-20 00:51:13 +03:00
a74de2d794
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 19:14:31 +01:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
d91606b354
Merge branch 'master' into DRTVWR-544-maint
2021-12-20 15:36:23 +02:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
e55a0510ff
SL-16510 VLC time slider sometimes does not work
2021-12-14 21:40:10 +02:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
3322eadea0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-519
2021-11-16 13:04:22 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
627eecd577
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 08:22:59 +01:00
ab4d4a4817
Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-11-16 01:24:03 +02:00
0505c6ebbb
Merge branch 'master' into DRTVWR-534
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:21:55 +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
7bef9a1605
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-10-12 13:34:36 +02:00
66b5e49a79
SL-16161 Don't process new plugin messages on shutdown #2
2021-10-11 19:26:45 +03:00
c1943e5efb
SL-16161 Don't process new plugin messages on shutdown
...
Some pending messages might try to update non-existing view or cause a pop up, neither should be avaliable by this point, so just don't process them
2021-10-08 23:56:43 +03:00
f843a97aeb
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
2021-09-20 11:26:51 +02:00
b12dd38c57
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-01 22:26:21 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
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
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
d53055406e
DRTVWR-521 xcode buildfix
2021-07-12 20:32:48 +03:00
dde3c2c7a8
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-05 14:03:30 +02:00
d875f80900
SL-14988 Plugin process creation can cause a notiecable delay
2021-05-25 03:31:50 +03:00
fa26f5eaa2
SL-14988 Viewer freezes when opening any CEF based window
...
Don't block main thread if possible
2021-05-24 15:59:52 +03:00
d313d7021f
SL-15200: Add LLApp::sleep(duration) methods.
...
Two sleep() methods: one accepting F32Milliseconds, or in general any LLUnits
time class; the other accepting any std::chrono::duration.
The significant thing about each of these sleep() methods, as opposed to any
freestanding sleep() function, is that it only sleeps until the app starts
shutdown. Moreover, it returns true if it slept for the whole specified
duration, false if it woke for app shutdown.
This is accomplished by making LLApp::sStatus be an LLScalarCond<EAppStatus>
instead of a plain EAppStatus enum, and by making setStatus() call set_all()
each time the value changes. Then each new sleep() method can call
wait_for_unequal(duration, APP_STATUS_RUNNING).
Introducing llcond.h into llapp.h triggered an #include circularity because
llthread.h #included llapp.h even though it didn't reference anything from it.
Removed. This, in turn, necessitated adding #include "llapp.h" to several .cpp
files that reference LLApp but had been depending on other header files to
drag in llapp.h.
2021-05-17 13:37:13 -04:00
493200bca5
Undo Linux updates.
2021-03-09 10:40:01 +01:00
4e3cd245e6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-15 17:46:45 +01:00
e275de5a82
SL-13497 Fixed error in logic
2021-02-11 13:00:48 +01:00
661d595967
SL-13497 Fixed error in logic
2021-02-10 22:31:38 +02:00
24b2f60d1a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm into linux-updates
2021-02-06 00:18:07 +01:00
49690e5b8b
Trap one specific fail code and force refresh of pollset
...
There may well be others that we should do this for but for now this eliminates the worst offender
2021-02-04 22:12:28 +00:00
52b3bb404c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-17 12:38:03 +01:00
543e5dc1d2
Improve logging of looping apr poll error in slplugin
...
won't change the issues but it should make the logging sane
2021-01-14 01:57:09 +00:00
af2abe17cd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 00:51:42 +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
78a79267e8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-19 09:30:26 +02:00
000f3be01a
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-18 23:53:40 +02:00
0efda8f28d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-08-18 22:41:20 +02:00
7925f7c7c3
Merge remote-tracking branch 'fs/master' into linux-updates
2020-08-15 21:00:44 +02:00
46bd337096
FIRE-30019: Remove clamp on shared media size on Linux
2020-08-14 18:32:11 -05:00
Ansariel