Commit Graph

749 Commits (bd3fe4cb2401ac9eeeeef932af2bb25db2e5c04e)

Author SHA1 Message Date
Beq a073df9084 [OPENSIM] Only show the adv perms export flag (X) when in OS 2023-07-18 17:06:08 +01:00
Ansariel 61fffbf661 Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingswater.cpp
2023-05-17 18:05:52 +02:00
akleshchev 6c4c57cb47
SL-19660 Merge pull request #199 from beqjanus/main
BUG-233797/233798 - fix blackout when u/w fog_density < 0
2023-05-09 17:55:00 +03:00
Ansariel 5dddaec717 Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer 2023-05-05 09:44:21 +02:00
Nat Goodspeed e7c5b9fb0f SL-19647: Eliminate LLSDArray entirely.
Newer C++ compilers have different semantics around LLSDArray's special copy
constructor, which was essential to proper LLSD nesting. In short, we can no
longer trust LLSDArray to behave correctly. Now that we have variadic
functions, get rid of LLSDArray and replace every reference with llsd::array().
2023-05-03 17:38:30 -04:00
Nat Goodspeed 3c77c1b90f DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:

some_LLSD_map[key] = LLSDArray(...)(...)...;

used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.

The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.

Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.

Tip of the hat to Chorazinallen for surfacing this issue!

(cherry picked from commit bb718155bd)
2023-05-03 12:31:42 -04:00
Ansariel 2a6c81f1d6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 17:52:00 +02:00
Beq 4ae5a8965f BUG-233797/BUG-233798 -ve underwater fog density causes blackout. 2023-04-30 11:52:22 +01:00
Beq 4a1dcaac82 BUG-233797/BUG-233798 -ve underwater fog density causes blackout 2023-04-30 11:38:45 +01:00
Ansariel 36fc36432d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/cmake/CMakeLists.txt
2023-03-30 12:20:59 +02:00
Ansariel 6ae8248f5d Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/de/floater_about_land.xml
#	indra/newview/skins/default/xui/de/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/de/floater_camera.xml
#	indra/newview/skins/default/xui/de/floater_camera_presets.xml
#	indra/newview/skins/default/xui/de/floater_linkreplace.xml
#	indra/newview/skins/default/xui/de/floater_people.xml
#	indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/de/floater_preview_trash.xml
#	indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/de/panel_group_roles.xml
#	indra/newview/skins/default/xui/de/panel_login.xml
#	indra/newview/skins/default/xui/de/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/de/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/de/panel_progress.xml
#	indra/newview/skins/default/xui/de/panel_region_environment.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/de/teleport_strings.xml
#	indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
#	indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
#	indra/newview/skins/default/xui/es/floater_camera.xml
#	indra/newview/skins/default/xui/es/floater_god_tools.xml
#	indra/newview/skins/default/xui/es/floater_people.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/es/panel_group_roles.xml
#	indra/newview/skins/default/xui/es/panel_landmark_info.xml
#	indra/newview/skins/default/xui/es/panel_login.xml
#	indra/newview/skins/default/xui/es/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/es/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/fr/floater_camera.xml
#	indra/newview/skins/default/xui/fr/floater_camera_presets.xml
#	indra/newview/skins/default/xui/fr/floater_forget_user.xml
#	indra/newview/skins/default/xui/fr/floater_linkreplace.xml
#	indra/newview/skins/default/xui/fr/floater_people.xml
#	indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/fr/floater_preview_trash.xml
#	indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/fr/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/fr/panel_group_roles.xml
#	indra/newview/skins/default/xui/fr/panel_login.xml
#	indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/fr/panel_progress.xml
#	indra/newview/skins/default/xui/fr/panel_region_environment.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/fr/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/it/floater_camera.xml
#	indra/newview/skins/default/xui/it/floater_camera_presets.xml
#	indra/newview/skins/default/xui/it/floater_god_tools.xml
#	indra/newview/skins/default/xui/it/floater_media_browser.xml
#	indra/newview/skins/default/xui/it/floater_people.xml
#	indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/it/floater_stats.xml
#	indra/newview/skins/default/xui/it/menu_login.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/it/panel_group_roles.xml
#	indra/newview/skins/default/xui/it/panel_landmark_info.xml
#	indra/newview/skins/default/xui/it/panel_login.xml
#	indra/newview/skins/default/xui/it/panel_notifications_channel.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/it/panel_place_profile.xml
#	indra/newview/skins/default/xui/it/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/it/panel_region_environment.xml
#	indra/newview/skins/default/xui/it/sidepanel_appearance.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/it/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/floater_camera.xml
#	indra/newview/skins/default/xui/ja/floater_camera_presets.xml
#	indra/newview/skins/default/xui/ja/floater_people.xml
#	indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/ja/panel_group_roles.xml
#	indra/newview/skins/default/xui/ja/panel_login.xml
#	indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/ja/panel_region_environment.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/ja/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
#	indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/pl/panel_profile_pick.xml
#	indra/newview/skins/default/xui/pl/panel_profile_picks.xml
#	indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/pl/panel_region_access.xml
#	indra/newview/skins/default/xui/pl/panel_script_experience.xml
#	indra/newview/skins/default/xui/pt/notifications.xml
#	indra/newview/skins/default/xui/pt/panel_group_roles.xml
#	indra/newview/skins/default/xui/pt/panel_landmark_info.xml
#	indra/newview/skins/default/xui/pt/panel_login.xml
#	indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
Nat Goodspeed bb718155bd DRTVWR-575: Replace some LLSDArray() usage with llsd::array().
It seems newer compilers have a different interpretation of exactly when to
engage LLSDArray's copy constructor. In particular, this assignment:

some_LLSD_map[key] = LLSDArray(...)(...)...;

used to convert the LLSDArray object directly to LLSD; now it first calls the
custom copy constructor, which embeds the intended array within an outer array
before assigning it into the containing map.

The newer llsd::array() function avoids that problem because what it returns
is already an LLSD object.

Taking inventory of LLSDArray assignments of that form turned up a number of
workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is
both simpler and more readable.

Tip of the hat to Chorazinallen for surfacing this issue!
2023-01-03 18:06:45 -05:00
Ansariel 1fc3aaff9b Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	.gitignore
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/00-Common.cmake
#	indra/cmake/Boost.cmake
#	indra/cmake/BuildVersion.cmake
#	indra/cmake/CEFPlugin.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/CURL.cmake
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/DBusGlib.cmake
#	indra/cmake/DragDrop.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/cmake/FindHUNSPELL.cmake
#	indra/cmake/FindJsonCpp.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FindURIPARSER.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/GLH.cmake
#	indra/cmake/Hunspell.cmake
#	indra/cmake/JsonCpp.cmake
#	indra/cmake/LLKDU.cmake
#	indra/cmake/LLPhysicsExtensions.cmake
#	indra/cmake/LLPlugin.cmake
#	indra/cmake/LLWindow.cmake
#	indra/cmake/Linking.cmake
#	indra/cmake/MESHOPTIMIZER.cmake
#	indra/cmake/MediaPluginBase.cmake
#	indra/cmake/NGHTTP2.cmake
#	indra/cmake/OPENAL.cmake
#	indra/cmake/OpenGL.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/OpenSSL.cmake
#	indra/cmake/PNG.cmake
#	indra/cmake/Tracy.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/Variables.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/cmake/ZLIBNG.cmake
#	indra/cmake/bugsplat.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/linux_crash_logger/CMakeLists.txt
#	indra/llaudio/CMakeLists.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llcommon/llapp.cpp
#	indra/llcorehttp/CMakeLists.txt
#	indra/llimagej2coj/CMakeLists.txt
#	indra/llinventory/CMakeLists.txt
#	indra/llmath/CMakeLists.txt
#	indra/llmath/llcalcparser.h
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/CMakeLists.txt
#	indra/llrender/llglslshader.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/media_plugins/CMakeLists.txt
#	indra/media_plugins/base/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llxmlrpclistener.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py
#	indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02: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
Nicky Dasmijn 0710d95f4b Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
Callum Linden f08f20db5f Merge branch 'master' into DRTVWR-568 2022-09-15 17:00:34 -07: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
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel fc11575657 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-29 20:28:29 +02:00
Andrey Lihatskiy 77ce594dec Merge branch 'master' into DRTVWR-544-maint 2022-06-29 20:31:17 +03:00
Nicky 95d5938eef Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake 2022-06-05 14:27:28 +02:00
Andrey Lihatskiy 9b0569840f Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
2022-05-31 01:58:09 +03:00
Ansariel 7d7aff4377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodel.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llinventorymodel.h
2022-05-28 23:00:17 +02:00
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
Nicky 283c2a20cc Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
sets the property on those.
2022-05-01 00:38:40 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
Nicky e0cf0cdfd4 Switch to target_include_directories
All 3Ps include dirs are treated as SYSTEM, this will stop compilers
stop emitting warnings from those files and greatly helps having high
warning levels and not being swamped by warnings that come from
external libraries.
2022-04-17 18:04:57 +02:00
Nicky bb85651d98 Create a new target ll::oslibrary to link against libs specific to the OS compiled on.
This gets rid of the a few OS specific set and uses variables (which some even seemed mostly
duplicate like WINDOWS_LIBRARIES ans UI_LIBRARIES) and it also solves the problem of
having them to tack on every target, as of no they come as a transitive dependency from llcommon
2022-04-16 15:29:02 +02:00
Nicky 786b291d9c Move CMake files to modernized cmake syntax, step 1.
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
Ansariel 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
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Andrey Kleshchev 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
Nicky 35cec6e3ad Initialize PODs with 0 and not leave anyting to chance. 2022-02-28 22:20:41 +01:00
Andrey Lihatskiy 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
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy 2178d9fa57 SL-16606: Add profiler category ENVIRONMENT 2022-01-14 11:50:19 -08:00
Ansariel f46a15b3f3 Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-11 15:04:11 +01:00
Mnikolenko Productengine 4966a66219 SL-16297 Init mObscureMOAP flag 2021-12-20 16:26:11 +02:00
Mnikolenko Productengine d91606b354 Merge branch 'master' into DRTVWR-544-maint 2021-12-20 15:36:23 +02:00
Mnikolenko Productengine 2112abac1b SL-16297 Support the parcel obscure_moap flag. 2021-12-17 18:13:20 +02:00
Dave Houlton cf35d27dfb DRTVWR-546 merge up to 6.5.2 2021-12-15 14:37:18 -07:00
Andrey Kleshchev 7c1cd47772 Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
# Conflicts:
#	indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
#	indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
Ansariel c2f8517118 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 21:01:05 +01:00
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00
Andrey Lihatskiy 0bffd3d365 Merge branch 'master' into DRTVWR-519
# Conflicts:
#	README.md
2021-11-16 01:21:05 +02:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +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