afd49409a7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/FreeType.cmake
# indra/cmake/ViewerMiscLibs.cmake
2023-03-31 16:56:37 +02:00
06ac6c615c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# doc/contributions.txt
# 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/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
2023-02-03 15:34:47 +01:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
130ac29ea6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 12:58:42 +01:00
291253d932
FIRE-32105: Application icon flashes also while viewer has focus
2023-01-27 21:30:20 +01:00
472ecc8088
SL-18999 IME disabling should be called in window's thread
...
For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only
2023-01-19 01:45:57 +02:00
89f3bf6c13
SL-18985 Crash at std::basic_string::erase
2023-01-18 19:20:36 +02:00
b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
0c9d4db072
[FIRE-32453][BUG-232971] Orderly shutdown of event queues
...
Terminate related queues before the windows thread to avoid loops.
Also increase timeout on queue full wait as we don't expect to see this so often now.
2023-01-03 18:50:24 +00:00
6c4ba94b25
[FIRE-32453][BUG-232971] Further edge cases for thread hangs on exit
2023-01-03 10:02:01 +00:00
e1479bd185
[FIRE-32453][BUG-232971] Improve shutdown behaviour. (Ty Rick Daylight)
...
Alter close down behaviour to ensure that the main UI window remains open until the process finishes persisting data and other close down activities.
2022-12-21 02:07:58 +00:00
92656117ba
Sundry additional debugs to help trace hang on exit in windows
2022-12-17 16:39:35 +00:00
15f55c0a88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
2022-12-13 18:03:50 +01:00
d01f7afff2
SL-18713 fix crash in handleCompositionMessage ( #12 )
2022-11-25 18:16:31 +02:00
a6ce12ab2b
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-11-11 13:27:28 +01:00
a53ccb2379
SL-18136 fix for Japanese IME
2022-11-02 19:38:01 +02:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
e9e62b798d
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-08-17 19:31:17 +02:00
aa5c4d45aa
SL-17719 Windows support for absolute mouse positioning #2
...
Better touch screen handling
2022-08-16 00:09:50 +03:00
ff895e96b2
SL-17719 Windows support for absolute mouse positioning
...
For virtual machines and touch screens
Also raw input is not subjected to mouse speed
2022-08-14 21:14:39 +03:00
e8f4153fc2
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
2022-06-30 18:59:34 +02:00
b0e9840648
Merge branch 'master' into DRTVWR-539
2022-06-29 21:03:15 +03:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
3a4a0bd3d2
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-06-29 17:25:32 +02:00
ba9bff5b9b
SL-17541 Show the message that user is currently at maximum FPS
2022-06-08 01:21:42 +03:00
ff65e23f20
SL-17515 FIXED Extreme Mouse Sensitivity for Certain Actions
2022-06-03 14:08:04 +03:00
e60b6e45e4
Manually apply fix for SL-17474 Device context not properly released at shutdown
2022-05-30 19:19:32 +02:00
ce0286c33b
SL-17474 Device context not properly released at shutdown
2022-05-30 15:02:03 +03:00
410704b5c6
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-05-03 11:37:50 +02:00
da6f4204b7
SL-17124 make sure window thread wakes up to proces 'quit' message
2022-04-29 22:18:20 +03:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
a775b9fc7f
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-04-19 15:49:47 +02:00
b8b0c8ec3b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-04-19 15:42:14 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
e76a3b12e6
SL-17074 fix ALT-F4 handling without impacting alt-zoom
2022-03-29 11:36:28 -06:00
578087b7bd
SL-17074 Fix Alt-F4 handling bug
2022-03-24 11:21:25 -06:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
25f974d77d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-03-01 10:00:36 +01:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
8c2deb6f8d
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/lltracker.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
2022-02-22 14:52:56 +01:00
0d6aa3c0fe
SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory.
2022-02-17 22:52:23 +00:00
0a0e2fe93e
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-15 02:39:07 +01:00
8c823b75c0
SL-16606: Add profiler category WIN32
2022-01-14 11:50:22 -08:00
265bca5d63
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2022-01-13 21:18:22 +01:00
3ac21ebbf6
SL-16454 FIXED Performance viewer login screen is black
2021-12-17 13:07:23 +02:00
d06070241a
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llvovolume.cpp
2021-12-16 10:09:12 +01:00
47e2173239
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/featuretable_mac.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2021-12-16 08:42:54 +01:00
c21dad8207
SL-16467 FIXED "Keyboard layout" is not switched
2021-12-13 12:14:14 +02:00
Ansariel