Ansariel
|
8a2c295298
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/skins/default/xui/en/panel_preferences_move.xml
# indra/newview/skins/default/xui/ja/floater_360capture.xml
# indra/newview/skins/default/xui/ja/floater_about_land.xml
# indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
# indra/newview/skins/default/xui/ja/floater_god_tools.xml
# indra/newview/skins/default/xui/ja/floater_inspect.xml
# indra/newview/skins/default/xui/ja/floater_joystick.xml
# indra/newview/skins/default/xui/ja/floater_land_holdings.xml
# indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
# indra/newview/skins/default/xui/ja/floater_model_preview.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
# indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
# indra/newview/skins/default/xui/ja/floater_preferences.xml
# indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
# indra/newview/skins/default/xui/ja/floater_settings_debug.xml
# indra/newview/skins/default/xui/ja/floater_snapshot.xml
# indra/newview/skins/default/xui/ja/floater_stats.xml
# indra/newview/skins/default/xui/ja/floater_tools.xml
# indra/newview/skins/default/xui/ja/floater_top_objects.xml
# indra/newview/skins/default/xui/ja/floater_ui_preview.xml
# indra/newview/skins/default/xui/ja/menu_attachment_other.xml
# indra/newview/skins/default/xui/ja/menu_avatar_other.xml
# indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
# indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
# indra/newview/skins/default/xui/ja/menu_inventory.xml
# indra/newview/skins/default/xui/ja/menu_participant_list.xml
# indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
# indra/newview/skins/default/xui/ja/menu_profile_other.xml
# indra/newview/skins/default/xui/ja/menu_profile_self.xml
# indra/newview/skins/default/xui/ja/menu_settings_gear.xml
# indra/newview/skins/default/xui/ja/menu_url_agent.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
# indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
# indra/newview/skins/default/xui/ja/panel_edit_universal.xml
# indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_notices.xml
# indra/newview/skins/default/xui/ja/panel_landmark_info.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
# indra/newview/skins/default/xui/ja/panel_nearby_media.xml
# indra/newview/skins/default/xui/ja/panel_people.xml
# indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
# indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
# indra/newview/skins/default/xui/ja/panel_place_profile.xml
# indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
# indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
# indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
# indra/newview/skins/default/xui/ja/panel_preferences_general.xml
# indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
# indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/panel_region_estate.xml
# indra/newview/skins/default/xui/ja/panel_region_terrain.xml
# indra/newview/skins/default/xui/ja/panel_status_bar.xml
# indra/newview/skins/default/xui/ja/panel_tools_texture.xml
# indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
# indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
|
2025-10-13 22:21:27 +02:00 |
|
Andrey Kleshchev
|
38257221d0
|
viewer#3018 Expose mouse wrap in UI
And attempt some basic automation
|
2025-10-13 16:27:36 +03:00 |
|
Ansariel
|
b99cf9fb86
|
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
|
2025-09-05 14:55:37 +02:00 |
|
Rye
|
e5ccf7a2a3
|
Remove dead code for macos versions 10.6 and older
|
2025-08-22 03:08:28 -04:00 |
|
Ansariel
|
355a80ab91
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
|
2025-05-23 13:13:24 +02:00 |
|
Andrey Kleshchev
|
6e6e105f01
|
#3317 Fix full screen issue with Windows 11 24H2
|
2025-05-05 18:30:33 +03:00 |
|
Ansariel
|
684bc1d1ea
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/llcommon/llsys.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/logcontrol.xml
# indra/newview/llappviewerwin32.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llspeakers.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvocache.cpp
# indra/newview/llvoicechannel.cpp
# indra/newview/llvoicechannel.h
# indra/newview/llvoiceclient.h
# indra/newview/llvoicevivox.cpp
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/viewer_manifest.py
# scripts/messages/message_template.msg.sha1
|
2024-06-21 19:46:51 +02:00 |
|
Ansariel
|
ea83746cda
|
Remove orphaned VRAM handling code
|
2024-06-17 19:04:41 +03:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Ansariel
|
f0e4dcdaf6
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
|
2024-05-08 05:10:22 +02:00 |
|
Andrey Kleshchev
|
ea268fcd48
|
viewer#799 getAvailableVRAMMegabytes cleanup
|
2024-05-07 08:25:13 +03:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
210f59a923
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llstatbar.cpp
# indra/llui/lltabcontainer.h
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/llwindow/llkeyboard.cpp
# indra/llwindow/llkeyboard.h
# indra/llwindow/llkeyboardheadless.cpp
# indra/llwindow/llkeyboardheadless.h
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl.cpp
# indra/llwindow/llwindowsdl.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchiclet.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatermap.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltoolcomp.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.h
# indra/newview/lltoolpie.cpp
|
2024-02-18 16:22:54 +01:00 |
|
Ansariel
|
c285f59ce2
|
Replace BOOL with bool in llwindow and dependent classes
|
2024-02-18 15:51:54 +02:00 |
|
Ansariel
|
33dfa20463
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lltextureview.cpp
# indra/newview/llviewerwindow.cpp
|
2024-02-15 21:41:29 +01:00 |
|
Andrey Kleshchev
|
a2971d84d5
|
Viewer#779 Make RenderMaxVRAMBudget more consistent
|
2024-02-15 19:31:41 +02:00 |
|
Ansariel
|
c06fa64758
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvosky.cpp
|
2023-12-01 13:10:11 +01:00 |
|
Andrey Lihatskiy
|
27dae1d967
|
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-30 13:30:27 +02:00 |
|
Ansariel
|
63f30264ff
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/newview/app_settings/settings.xml
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llinspectavatar.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llviewerjoystick.cpp
|
2023-10-26 20:58:56 +02:00 |
|
Andrey Kleshchev
|
3084f86417
|
SL-13610 [MAC] Manufacturer based search
|
2023-10-23 15:26:19 +03:00 |
|
Andrey Kleshchev
|
453a4a13f8
|
SL-13610 [MAC] WIP enable initing devices by local id
|
2023-10-23 15:26:19 +03:00 |
|
Andrey Kleshchev
|
9b27b6e509
|
SL-13610 [MAC] WIP List HID available devices in joystick selection
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
|
2023-10-23 15:26:19 +03:00 |
|
Ansariel
|
289fb458f3
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# doc/contributions.txt
# indra/llprimitive/llmaterial.h
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/llvovolume.cpp
|
2023-07-18 10:59:02 +02:00 |
|
Brad Linden
|
f975cfd736
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-07-17 13:37:03 -07:00 |
|
Ansariel
|
ccb1dfa072
|
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
|
2023-05-02 20:11:20 +02:00 |
|
Andrey Lihatskiy
|
504ef7e9e3
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-05-02 17:39:29 +03:00 |
|
Ansariel
|
ffa21ae649
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
|
2023-04-28 00:39:47 +02:00 |
|
Brad Linden
|
369945b45d
|
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
|
2023-04-26 15:38:47 -07:00 |
|
Andrey Kleshchev
|
895ce616ea
|
SL-19652 Fixed 'working' cursor flicker
|
2023-04-25 22:49:33 +03:00 |
|
Ansariel
|
13a509fe05
|
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
# .gitignore
# autobuild.xml
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerregion.h
# indra/newview/llviewerwindow.cpp
|
2022-11-30 22:51:52 +01:00 |
|
Dave Parks
|
b5db671f7c
|
SL-18682 WIP -- Add debug settings that aid in emulating low end hardware.
|
2022-11-29 09:15:02 -06:00 |
|
Ansariel
|
e8f4153fc2
|
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
|
2022-06-30 18:59:34 +02:00 |
|
Mnikolenko Productengine
|
ba9bff5b9b
|
SL-17541 Show the message that user is currently at maximum FPS
|
2022-06-08 01:21:42 +03:00 |
|
Ansariel
|
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 |
|
Nat Goodspeed
|
3604edc27e
|
SL-17219: LLWindowMacOSX needs getAvailableVRAMMegabytes().
This is just a placeholder, but without it the viewer won't even build on Mac.
|
2022-05-10 12:20:19 -04:00 |
|
Dave Parks
|
e60024f0af
|
SL-17005 WIP - Use D3D/DXGI to query for available VRAM on Windows
|
2022-03-29 15:41:00 -05:00 |
|
Ansariel
|
d881fa40d3
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
|
2021-11-20 22:35:31 +01:00 |
|
Mnikolenko ProductEngine
|
fdeeb0190e
|
SL-16330 Allow vsync update without restart on mac
|
2021-11-17 17:51:50 +02:00 |
|
Ansariel
|
63cc972499
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
|
2021-11-12 17:31:39 +01:00 |
|
Ansariel
|
7427b46ea5
|
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
|
2021-11-12 15:21:52 +01:00 |
|
Mnikolenko Productengine
|
768b7a4d33
|
SL-16330 Clean up vertical sync handling, add to UI
|
2021-11-09 17:17:49 +02:00 |
|
Vir Linden
|
ba3459f77f
|
Merged DRTVWR-546 into SL-15999
|
2021-10-25 15:55:06 +00:00 |
|
Brad Payne (Vir Linden)
|
e5cd9cb90f
|
merge
|
2021-10-22 18:11:48 +01:00 |
|
Dave Parks
|
5553d61421
|
SL-16203 Fix for wonky handling of mouse deltas.
|
2021-10-22 17:01:33 +00:00 |
|
Dave Parks
|
851767b808
|
SL-16131 Fix for alignment warnings on Win32 builds.
|
2021-10-14 17:41:38 +00:00 |
|
Dave Parks
|
d00272e0cc
|
SL-16099 Multi-threaded OpenGL usage on Windows, enable Core Profile and VAOs by default.
|
2021-10-11 16:03:40 +00:00 |