Ansariel
|
c6d1422067
|
* Add some improvements to check for Vintage skin
* Fix logic for hiding the bottom tool on Vintage that has never actually worked properly due to startup order
|
2025-06-10 14:44:21 +02:00 |
|
Hecklezz
|
744d3dddf3
|
Fixed 2K textures having - upload cost in OpenSim
|
2025-06-09 06:05:59 +10:00 |
|
Hecklezz
|
d26bf4cbd2
|
Fixes exporting textures getting downscaled and compressed, and a minor comment fix.
|
2025-03-26 03:02:48 +10:00 |
|
Beq
|
8c57cb9076
|
[FIRE-35276] add OpenSim MaxProfilePicks support and set fallback to 20
Fallback value agreed with Ubit.
|
2025-03-24 10:36:36 +00:00 |
|
Hecklezz
|
653a9b4df7
|
Fix for client freeze in OpenSim getting picks limit
|
2025-03-23 17:58:58 +10:00 |
|
Ansariel
|
0a83a1e6b7
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/llagentbenefits.cpp
# indra/newview/llagentbenefits.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llsnapshotlivepreview.cpp
|
2024-07-18 20:04:45 +02:00 |
|
Ayane
|
bd0baebb6e
|
Raised the 512x512 limitation for uploading snapshots to inventory to 2048x2048 (#2025)
|
2024-07-17 02:47:22 +03:00 |
|
chanayane
|
0377b775d7
|
Raised the 512x512 limitation for uploading snapshots to inventory to 2048x2048
|
2024-07-10 00:32:35 +02:00 |
|
Ansariel
|
2c46d3468c
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
|
2024-05-30 22:55:21 +02:00 |
|
Andrey Kleshchev
|
7ed053d9a2
|
viewer#1520 Material upload floater displays wrong upload fee
|
2024-05-21 10:11:44 +03:00 |
|
Ansariel
|
343aeeeb36
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# doc/contributions.txt
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
|
2024-05-16 02:11:51 +02:00 |
|
Andrey Lihatskiy
|
b06a99f7c7
|
Post-merge spaces fix
|
2024-05-15 12:47:27 +03:00 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +02: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
|
f4250bcfaf
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llmanip.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llselectmgr.h
# indra/newview/pipeline.h
|
2024-04-24 22:05:15 +02:00 |
|
Andrey Kleshchev
|
9b5615647d
|
viewer#1081 removed a 'not finalized' part of 2K benefits
This part isn't planned at the moment, at least not this way, remove to
not cause issues once server side changes behavior
|
2024-04-19 01:06:35 +03:00 |
|
Ansariel
|
3b902c9f36
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/CMakeLists.txt
# indra/newview/llagentbenefits.cpp
# indra/newview/llgltfmateriallist.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llvocache.cpp
# indra/newview/llvocache.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/viewer_manifest.py
|
2024-04-17 10:57:12 +02:00 |
|
Andrey Kleshchev
|
7df1bc9e65
|
viewer#1081 2K texture apload price arrives as an array #2
|
2024-04-12 21:53:35 +03:00 |
|
Ansariel
|
5e8b177643
|
Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llagentbenefits.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llpanelmaininventory.cpp
|
2024-04-02 20:53:58 +02:00 |
|
Andrey Kleshchev
|
18ef2e3b2b
|
viewer#1081 Account for 2K texture upload price in material and texture upload
|
2024-04-01 19:30:51 +03:00 |
|
Ansariel
|
00464b15cd
|
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/llfolderviewitem.cpp
# indra/llui/llui.h
# indra/llxml/llcontrol.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltoolpie.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerwindow.cpp
|
2023-09-22 20:47:05 +02:00 |
|
Ansariel
|
f22d590dea
|
Wire up premium perk pick limits
|
2020-04-09 10:01:05 +02:00 |
|
Ansariel
|
90cbec4a54
|
Merge DRTVWR-481
|
2020-02-08 18:43:22 +01:00 |
|
andreykproductengine
|
9621dd8bbd
|
SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work
|
2019-11-22 20:18:30 +02:00 |
|
Brad Payne (Vir Linden)
|
5eecc6cad9
|
SL-10499 - Added picks_limit to benefits info. Will be needed in profiles eventually.
|
2019-11-20 20:23:33 +00:00 |
|
Brad Payne (Vir Linden)
|
4300b204f0
|
SL-10499 - handle package info from benefits service
|
2019-11-20 14:03:57 +00:00 |
|
Brad Payne (Vir Linden)
|
d12e10be37
|
SL-10499 - bulk upload behavior adjusted to account for possibly different upload prices for different asset types. Also added a confirmation dialog for bulk upload.
|
2019-11-18 17:15:11 +00:00 |
|
Brad Payne (Vir Linden)
|
65550520ed
|
SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits.
|
2019-11-15 15:13:11 +00:00 |
|
Brad Payne (Vir Linden)
|
7df0a4ddd0
|
SL-10499, SL-10497 - use LLAgentBenefits info
|
2019-11-14 15:01:50 +00:00 |
|
Brad Payne (Vir Linden)
|
b3b103efe5
|
SL-10498 - benefits info received at login, persisted in new LLAgentBenefits singleton.
|
2019-11-12 22:26:10 +00:00 |