summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
AgeCommit message (Collapse)Author
2024-06-14Merge branch 'release/maint-b' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # .github/workflows/build.yaml # indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl # indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl # indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl # indra/newview/llfilepicker.cpp
2024-05-15Post-merge spaces fixAndrey Lihatskiy
2024-05-15Merge branch 'main' into marchcat/x-b-mergeAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/ConfigurePkgConfig.cmake # indra/cmake/ICU4C.cmake # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h # indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp # indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h # indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llfloateremojipicker.cpp # indra/newview/lloutfitslist.cpp
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-10Merge branch 'main' into marchcat/b-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/newview/lloutfitslist.cpp
2024-04-09Merge remote-tracking branch 'origin/main' into release/materials_featuretteBrad Linden
2024-04-05Linux viewer (ReleaseOS) resurrection (#1099)Nicky Dasmijn
Co-authored-by: AiraYumi <aira.youme@airanyumi.net>
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-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
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-12Merged DRTVWR-544-maint into SL-12238Howard Stearns
2022-05-11SL-12238 - error message to match new limitsHoward Stearns
2022-05-11SL-12238 - bump terrain texture size limit to 1024Howard Stearns
2022-03-30SL-16668 Enable/disable appropriate menu items in context menuMnikolenko Productengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 19:59:40 +0000