Commit Graph

123 Commits (b2e3159ce76b7aeafd3b083fa34b76d002a85a2b)

Author SHA1 Message Date
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Andrey Kleshchev 244566cc3f viewer#1506 The Dynamic probe checkbox wasn't working 2024-06-25 07:12:12 +03:00
Brad Linden 7889df945b Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development 2024-06-04 17:39:39 -07:00
Jonathan "Geenz" Goodman c413458fd4
#1628 Disable spherical mirror probes for the time being. (#1631) 2024-06-04 15:22:38 -07:00
Andrey Kleshchev 2d0fe5ca7b viewer#1497 Gray out some options for Mirror (Everything)
Ambiance and Near Clip fields for a Mirror probe should be grayed out for Mirror (Everything)
2024-05-29 11:06:51 +03:00
Brad Linden a1f49564d6 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07: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
Andrey Lihatskiy b06a99f7c7 Post-merge spaces fix 2024-05-15 12:47:27 +03:00
Brad Linden 31a3423239 Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development 2024-05-14 11:07:13 -07:00
Jonathan "Geenz" Goodman ca5e89d741
Even more mirror fixes. (#1429)
#1271 Add support for mirrors that do not have avatars in them.  It does this based on if the probe is set to dynamic or not.

#1370 More optimization work to reduce GPU utilization.

#1058 - Removed sim feature flag that was overriding mirrors enabled flags

secondlife/viewer-private#128 - Locally cache the mirror probe

#679 Add additional options to the build floater for mirror probes, including descriptions.
2024-05-08 11:28:51 -07:00
Dave Parks 155ddf2336
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
2024-05-07 09:47:37 -05:00
Alexander Gavriliuk f9473e8afc secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries 2024-05-07 10:18:51 +02:00
RunitaiLinden c6d752b880 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge 2024-05-06 16:48:58 -05: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 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
RunitaiLinden a7310ae741 #671 Nudge RenderMirrors and clear shader cache as needed based on SimulatorFeatures 2024-02-08 15:07:54 -06:00
Jonathan "Geenz" Goodman 97d2b21621 #671 Setup the viewer to respect the MirrorsEnabled simulator feature. 2024-02-08 11:39:35 -08:00
Jonathan "Geenz" Goodman 192e77344f Make the UI conditional. 2024-02-08 10:40:56 -08:00
Jonathan "Geenz" Goodman 739ff27c06 #740 Make sure we evaluate if the probe is a mirror probe or not.
#682 Re-enable gaussian filtering, and reduce the mirror resolution back to 1024.

Also just generally clean up the code a bit.
2024-02-06 02:53:57 -08:00
Jonathan "Geenz" Goodman 0862491910 #679 Add mirror update params to the volume floater.
#740 Add support for FLAG_MIRROR in the viewer for mirror probes.
2024-02-06 01:31:13 -08:00
Jonathan "Geenz" Goodman 373b06398c Merge remote-tracking branch 'origin/release/materials_featurette' into DRTVWR-583 2024-01-24 14:37:33 -08:00
Maxim Nikolenko f9cba58fe2
SL-20645 don't show the warning when 'Select Reflection Probes' is enabled 2023-11-28 14:31:27 +02:00
Andrey Kleshchev b3384a057d SL-20228 When a reflection probe is unchecked in a link set, it should stop being phantom 2023-11-09 00:40:36 +02:00
Andrey Kleshchev 901de39ca7 SL-20569 Notify user when reflection probe can't be selected #2 2023-11-08 20:21:24 +02:00
Andrey Kleshchev de844bfce1 SL-20569 Notify user when reflection probe can't be selected 2023-11-08 20:21:24 +02:00
Jonathan "Geenz" Goodman 73870cb0b4 Merge branch 'DRTVWR-559' into DRTVWR-583 2023-09-25 09:27:49 -07:00
Andrey Kleshchev 97ee8b207b SL-5522 Fix applying textuers and materials with limited restrictions to attachments
1. Texture picker now updates filter's permissions based on selection
2. Various panels now properly check permissions
2023-09-19 01:01:43 +03:00
Jonathan "Geenz" Goodman 32d1984bf9 Temporary data model shenanigans.
Should help tweak and tune placement with direct community guidance.
DRTVWR-583
2023-09-01 08:28:57 -07:00
Jonathan "Geenz" Goodman fbecd348f8 Add protocol level mirror support, and UI. 2023-08-29 03:04:04 -07:00
Dave Parks 36f37ebf8a SL-19263 Tidy up the reflection probe warning modal and add a cancel button. 2023-02-28 12:08:25 -06:00
Dave Parks 74275f590e SL-18927 Warn *before* destroying content, not after. Followup from last commit -- immediately apply scale to sphere probes. 2023-02-15 14:47:33 -06:00
Dave Parks 5fcfe95422 SL-18782 Make primitive parameters automatically follow Reflection Probe controls. 2022-12-13 16:13:49 -06:00
Andrey Kleshchev e6fad1ea5f SL-17999 Material with limited permissions should be copied to object's inventory 2022-09-27 23:26:25 +03:00
Andrey Kleshchev 94b9286858 SL-17999 'copy' functionality for 'features' and 'texture' tabs
And a fix to prevent message spam
2022-09-22 11:06:41 +03:00
Andrey Kleshchev 7649114588 Merge branch master (DRTVWR-571) into DRTVWR-559
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
2022-09-16 21:07:39 +03:00
Brad Kittenbrink 38208441db Merge remote-tracking branch 'origin/master' into DRTVWR-559 2022-08-04 10:59:26 -07:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Dave Parks 509476f95e SL-17574 Add probe detail combo box to advanced graphics preferences. Fix spot light shadows not working in probes. 2022-06-10 01:13:41 -05:00
Dave Parks 03d85bfb33 SL-17573 Add "dynamic" checkbox, also followup on SL-17551 and do "Select Invisible Objects" checkbox instead of "Select Reflection Probes" 2022-06-09 19:43:21 -05:00
Dave Parks 0d9c23372b SL-17551 Add "Select Reflection Probes" menu option and make invisible objects less annoying when alt-zooming in edit mode. 2022-06-09 14:09:33 -05:00
Dave Parks 5f606069e2 SL-17285 Fix for probe influence volume combo box not applying. 2022-06-08 17:48:58 -05:00
Dave Parks 220afbcda0 SL-17285 Add proper reflection probe support to LLVOVolume, LLPrimitive, and LLPanelVolume 2022-06-02 18:42:38 -05:00
Mnikolenko Productengine 8b7691498f SL-16758 Show light controls regardless of current graphic settings 2022-02-02 16:39:28 +02:00
Andrey Lihatskiy 098c4c0371 Merge branch 'master' into DRTVWR-486
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelvolume.h
2021-11-16 01:45:17 +02:00
Mnikolenko Productengine a95d846a5c SL-16218 treat texture selection similar to diffuse map handling. 2021-10-25 15:15:02 +03:00
Mnikolenko Productengine 94eea485ed SL-13545 FIXED The 'Flexible Path' settings can be pasted to the sculpted object 2020-07-07 16:04:37 +03:00
Andrey Kleshchev 052e1adcd0 SL-13359 #9 Texture tab 2020-06-19 22:18:31 +03:00
Andrey Kleshchev d95f86c593 SL-13359 #7 Features tab 2020-06-18 22:38:58 +03:00