summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
AgeCommit message (Collapse)Author
2024-06-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
DRTVWR-600-maint-A # Conflicts: # indra/llappearance/llavatarappearance.h # indra/llimage/llimage.cpp # indra/llmath/llvolume.cpp # indra/llmath/llvolume.h # indra/llprimitive/llgltfmaterial.h # indra/llrender/llrendertarget.cpp # indra/llrender/llshadermgr.cpp # indra/newview/lldynamictexture.cpp # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterimagepreview.cpp # indra/newview/llfloaterimagepreview.h # indra/newview/llfloaterregioninfo.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llmaniprotate.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llpanelvolume.cpp # indra/newview/llselectmgr.cpp # indra/newview/llselectmgr.h # indra/newview/llsurface.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvocache.cpp # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp
2024-06-01Re-enable a lot of compiler warnings for MSVC and address the C4267 ↵Ansariel
"possible loss of precision" warnings
2024-05-22Fix line endlingsAnsariel
2024-05-22Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-AAnsariel
# 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-15Post-merge spaces fixAndrey Lihatskiy
2024-05-07secondlife/viewer#1333 BOOL to bool conversion leftovers: ternariesAlexander Gavriliuk
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-04-11Merge branch 'main' of https://github.com/secondlife/viewer into ↵Ansariel
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-09Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-03-20Merge pull request #1024 from secondlife/vi-83cosmic-linden
secondlife/viewer-issues#83: Disallow alpha blend/double sided from PBR terrain
2024-03-20secondlife/viewer-issues#83: Add TODO/assert for deciding when to allow ↵Cosmic Linden
candidate future extensions on PBR terrain
2024-03-20secondlife/viewer-issues#83, secondlife/viewer-issues#82: Combine terrain ↵Cosmic Linden
save error notifications
2024-03-20secondlife/viewer-issues#83: Disallow alpha blend/double sided from PBR terrainCosmic Linden
2024-03-20Merge pull request #1019 from secondlife/vi-82cosmic-linden
secondlife/viewer-issues#82: Don't allow transparent texture terrain
2024-03-19secondlife/viewer-issues#82: Don't allow transparent texture terrainCosmic Linden
2024-03-18secondlife/viewer#1006: Move blank material constant to indra_constants.hCosmic Linden
2024-03-15secondlife/viewer#1006: Prevent PBR terrain material swatches from being ↵Cosmic Linden
null. Default to blank material for now.
2024-03-15secondlife/viewer#1006: Don't send terrain update if validation failsCosmic Linden
2024-03-15secondlife/viewer#760: Fix terrain texture validator not respecting ↵Cosmic Linden
RenderMaxTextureResolution
2024-03-13secondlife/viewer#76: Change wording of terrain blending documentation when ↵Cosmic Linden
using materials
2024-03-08secondlife/viewer#712: Slightly improved logging in refreshFromRegionCosmic Linden
2024-03-08secondlife/viewer#712: Consolidate accesses to texture_detail_* and ↵Cosmic Linden
material_detail_* controls
2024-03-07secondlife/viewer#712: Consolidate accesses to terrain_material_type controlCosmic Linden
2024-03-06secondlife/viewer#712: Clean up unused region change callback checksCosmic Linden
2024-03-01secondlife/viewer#712: Use checkbox to make it more obvious that only one ↵Cosmic Linden
set of terrain assets is preserved. Clean up enums.
2024-02-29secondlife/viewer#712: Remember previously set textures/materials when ↵Cosmic Linden
possible. Not persistent.
2024-02-29secondlife/viewer#712: More intuitive selection of PBR vs texture terrain, ↵Cosmic Linden
and update dropdown to match
2024-02-21Convert remaining BOOL to boolAnsariel
2024-02-21Convert BOOL to bool in lluiAnsariel
2024-02-21Convert BOOL to bool in LLControlGroup and related classesAnsariel
2024-02-17misc: BOOL to boolLars Næsbye Christensen
2024-02-09secondlife/viewer#773: Fix RenderTerrainPBREnabled requiring restart and ↵Cosmic Linden
respect simulator feature PBRTerrainEnabled
2024-01-23Put PBR terrain behind feature flagCosmic Linden
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: (WIP) Roughly working draft of PBR terrainCosmic Linden
2023-10-13DRTVWR-592: (WIP) Detect when terrain materials are loaded, use as fallback ↵Cosmic Linden
when terrain textures do not load
2023-10-13DRTVWR-592: (WIP) More work on terrain texture editing GUICosmic Linden
2023-10-13DRTVWR-592: (WIP) Save PBR material terrain (does not yet render)Cosmic Linden
2023-10-13DRTVWR-592: (WIP) Add material terrain selection to GUICosmic Linden
2023-10-13DRTVWR-592: Allow using RGBA textures for terrain, as the texture uploader ↵Cosmic Linden
does not consolidate opaque textures
2023-08-23Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2023-08-08SL-19807 BugSplat Crash: LLDispatchSetEstateExperience::getIDs()Alexander Gavriliuk
2023-07-20SL-19948 Update estate manager and ban list limits to match new values from ↵Andrey Lihatskiy
simulator
2023-03-30Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-03-21SL-19348 Remove 'get mesh_rez_enabled' code in viewerAlexander Gavriliuk
2023-03-21SL-19289 UI for Estate Floater - Block Scripted Agents from Estate/RegionAndrey Lihatskiy
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-08-26DRTVWR-568: Eliminate more blockers to C++17 language standard.Nat Goodspeed
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-27 13:25:49 +0000