Commit Graph

365 Commits (e0d14e02e152b4e75ff8bdd974677f9669163d68)

Author SHA1 Message Date
Maxim Nikolenko 559ce54d50 #3072 don't update UI on cancel event from texture picker 2025-03-05 15:16:14 +02:00
Andrey Kleshchev 9f47542597 #3265 Crash at getAllowEnvironmentOverride
Check region pointer and make sure external callbacks get disconected
2024-12-12 14:39:51 +02:00
Alexander Gavriliuk 27b8e6d576 #2408 The long covenant with emojis significantly slows down some operations in the viewer 2024-09-18 17:13:59 +02:00
Cosmic Linden 0f166a199d secondlife/viewer#2490: Fix PBR terrain texture transform feature flag handled by viewer in unpredictable manner 2024-09-03 17:53:21 -07:00
Alexander Gavriliuk 17fed3985f #2360 Incorrect Day Cycle name in Edit Day Cycle floater (remove unused key CANMOD) 2024-08-30 00:55:32 +02:00
Ansariel Hiller fceec45641
Fix a bunch of XUI warnings (#2120) 2024-07-27 18:10:17 +03:00
Andrey Kleshchev 4d7f622a3c
viewer#2065 Region restart schedule floater 2024-07-25 16:02:03 +03:00
Rye Mutt e3deb8340a Fix excessive findChild calls during about land floater draw 2024-07-25 08:45:53 -04:00
Rye Mutt 70f332d02e Fix findChild during draw in the parcel/region environment panel 2024-07-25 08:45:53 -04:00
Andrey Kleshchev aa3fe3352e viewer#1975 Fixed "Allow Land Resell" option not switching 2024-07-11 10:58:19 +03:00
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 886be2faf1 viewer#1857 Reset texture transforms when terrain PBR is applied
ctrls aren't dynamically alocated so getChild is preferable, but since other elements use findchild and validy checks used findChild as well
2024-07-02 19:34:37 +03:00
Cosmic Linden fcf9af42fa secondlife/viewer#907: Review feedback 2024-06-13 12:49:48 -07:00
Cosmic Linden 8861264d8d secondlife/viewer#1475: Fix Terrain tab controls no longer disabled when insufficient permissions 2024-06-13 09:11:39 -07:00
Brad Linden 7c42711ca3 Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development 2024-06-10 16:22:12 -07:00
Cosmic Linden eb431ee879 secondlife/viewer#1475: Fix whitespace and remove comment 2024-06-10 11:16:12 -07:00
Cosmic Linden 6de0086ae9 secondlife/viewer#1475: Add PBR terrain repeats editing 2024-06-07 18:14:32 -07:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
Andrey Kleshchev ed16808113 viewer#1552 Bake textures could be applied to terrain textures 2024-05-24 18:28:52 +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
Ansariel 799ebf2162 Fix broken merge and BOOL/bool issues 2024-05-10 15:16:06 +02: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 d0102af56d Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
#	indra/llcommon/llapp.cpp
#	indra/llcommon/llapp.h
#	indra/llimage/llimageworker.cpp
#	indra/llui/llcontainerview.cpp
#	indra/llui/llcontainerview.h
#	indra/llui/llkeywords.cpp
#	indra/llui/lltabcontainer.cpp
#	indra/llui/lltextbase.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfavoritesbar.h
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llhudnametag.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llinventorypanel.h
#	indra/newview/llmeshrepository.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llpanelprofilepicks.cpp
#	indra/newview/llpanelvoicedevicesettings.h
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llpreviewscript.h
#	indra/newview/llselectmgr.cpp
#	indra/newview/lltranslate.cpp
#	indra/newview/llviewerassetupload.cpp
#	indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
Brad Linden 5a47a3cb23 Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-04-09 14:17:34 -07:00
cosmic-linden 3afb104199
Merge pull request #1024 from secondlife/vi-83
secondlife/viewer-issues#83: Disallow alpha blend/double sided from PBR terrain
2024-03-20 13:41:52 -07:00
Cosmic Linden 294eaa3c57 secondlife/viewer-issues#83: Add TODO/assert for deciding when to allow candidate future extensions on PBR terrain 2024-03-20 13:36:20 -07:00
Cosmic Linden d21813786a secondlife/viewer-issues#83, secondlife/viewer-issues#82: Combine terrain save error notifications 2024-03-20 13:14:43 -07:00
Cosmic Linden a0649375e1 secondlife/viewer-issues#83: Disallow alpha blend/double sided from PBR terrain 2024-03-20 10:58:33 -07:00
cosmic-linden 93231d4eed
Merge pull request #1019 from secondlife/vi-82
secondlife/viewer-issues#82: Don't allow transparent texture terrain
2024-03-20 08:58:58 -07:00
Cosmic Linden 7792e62d3c secondlife/viewer-issues#82: Don't allow transparent texture terrain 2024-03-19 16:03:57 -07:00
Cosmic Linden d0458c4853 secondlife/viewer#1006: Move blank material constant to indra_constants.h 2024-03-18 13:57:01 -07:00
Cosmic Linden 7ae7f9554d secondlife/viewer#1006: Prevent PBR terrain material swatches from being null. Default to blank material for now. 2024-03-15 16:43:20 -07:00
Cosmic Linden faa0f36964 secondlife/viewer#1006: Don't send terrain update if validation fails 2024-03-15 16:19:42 -07:00
Cosmic Linden cb1b23d8bf secondlife/viewer#760: Fix terrain texture validator not respecting RenderMaxTextureResolution 2024-03-15 10:45:53 -07:00
Cosmic Linden e42297fb19 secondlife/viewer#76: Change wording of terrain blending documentation when using materials 2024-03-13 16:19:28 -07:00
Cosmic Linden b84d76e243 secondlife/viewer#712: Slightly improved logging in refreshFromRegion 2024-03-08 16:29:00 -08:00
Cosmic Linden b4eb144f14 secondlife/viewer#712: Consolidate accesses to texture_detail_* and material_detail_* controls 2024-03-08 15:14:07 -08:00
Cosmic Linden 7f2e3d0f27 secondlife/viewer#712: Consolidate accesses to terrain_material_type control 2024-03-07 17:32:23 -08:00
Cosmic Linden 55fdd540d2 secondlife/viewer#712: Clean up unused region change callback checks 2024-03-06 13:04:40 -08:00
Cosmic Linden 94c5baeb61 secondlife/viewer#712: Use checkbox to make it more obvious that only one set of terrain assets is preserved. Clean up enums. 2024-03-01 17:26:24 -08:00
Cosmic Linden 0cb9e7f7e5 secondlife/viewer#712: Remember previously set textures/materials when possible. Not persistent. 2024-02-29 16:52:35 -08:00
Cosmic Linden d79498e259 secondlife/viewer#712: More intuitive selection of PBR vs texture terrain, and update dropdown to match 2024-02-29 14:52:55 -08: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
Ansariel 8c16ec2b53 Convert BOOL to bool in LLControlGroup and related classes 2024-02-21 03:00:25 +02:00