aed6313d7c
Merge branch 'main' into DRTVWR-594-maint-Y
2023-12-18 06:33:57 +02:00
c409236dac
Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge
...
# Conflicts:
# indra/newview/llinventorygallery.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-11-30 18:09:29 +02:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
29dd53310a
SL-20109 Add inventory_thumbnails_helper floater to blacklist_untrusted
2023-10-25 23:53:32 +03:00
327f1b8f34
Merge branch 'viewer_bulky_thumbs' into marchcat/maint-Y-bulky-thumbs
...
# Conflicts:
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-10-25 21:42:21 +03:00
d4123ec30d
Merge branch 'main' into DRTVWR-587-maint-V
...
# Conflicts:
# indra/newview/llinventorymodel.cpp
# indra/newview/llvovolume.cpp
2023-10-03 19:25:19 +03:00
7d50a51434
Merge branch 'main' (DRTVWR-567) into DRTVWR-559
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llagent.cpp
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsidepaneltaskinfo.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +03:00
1aa27d4d13
SL-20273 IM, Offer Teleport, Map and Pay SLurls from external browser were blocked
2023-09-07 23:06:00 +03:00
3d73a10da3
Merge branch main (DRTVWR-582) into DRTVWR-567
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/llinventoryobserver.h
# indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
c6d5f11f63
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-08-23 12:26:14 -07:00
0b85c05f8e
SL-20145 New inventory feature notification
...
Pulled in relevant parts from SL-19929
2023-08-21 19:51:04 +03:00
d3147517b4
Remove the original prototype tool Bulky Thumbs since it is now superceded by the Inventory Thumbnail Helper tool
2023-08-17 15:55:42 -07:00
2d39f05cc1
SL-20109: Now that it seems that the tool might be useful, make a new version with a proper name and start worknig on it. Prototype bulky thumbs one will be removed after new version is working
2023-08-11 18:07:13 -07:00
2aecd42d1f
First commit of code to investigate how we might do bulk uploads of inventory item thumbnails - both from a code and a UI perspective
2023-08-01 15:51:18 -07:00
f149b87fcc
SL-19929 New inventory feature notification
2023-06-29 23:54:27 +03:00
ade8c96e5c
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappviewer.cpp
2023-05-02 17:57:11 +03:00
1444c4a23c
Merge branch 'main' into DRTVWR-582-maint-U
2023-05-02 17:39:13 +03:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
daca555592
SL-19609 Urls aren't dispatched according to the indicated grid
2023-04-19 20:06:37 +03:00
0d068b0f30
SL-19479 Remove outfit photo preview and replace with a pop up
2023-03-29 22:56:48 +03:00
4d2bdbb05a
SL-19282 Removed LLInspectTexture floater
...
LLInspectTexture floater appears to be incomplete and doesn't have a function
2023-03-02 01:46:46 +02:00
49da5288bd
SL-19234 add Inventory settings floater
2023-02-24 03:17:53 +02:00
6a260bb3f0
SL-19108 Rename outfit snapshot floater
2023-02-21 00:24:23 +02:00
ec02220f06
SL-19108 WIP Managing inventory thumbnail #1
2023-02-17 23:09:51 +02:00
1cc41cb9c4
SL-19134 Remove llfloaterproperties
...
Looks like it wasn't used for a while and LLFloaterItemPropertie does the same thing now
2023-02-08 14:27:52 +02:00
c9ba8f1fce
SL-19109 Decouple object profiles from inventory
...
Potentially this won't stay as sidepanels, but such rework is planned for SL-19134, for now just making it possible to open multiple instances of item profiles
2023-02-03 23:56:35 +02:00
51142d1341
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
1140ae3489
Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures
2023-02-01 16:38:47 +02:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
8c5c07d307
SL-18448 Modified Material Editor to match overrides better
2022-11-01 22:20:38 +02:00
ece2e7b39a
SL-18165 Mac build fix
2022-10-11 23:04:43 +03:00
6f946b6b16
SL-18165 Tighten up some command permissions
2022-10-11 17:29:44 +03:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
eaf8698033
SL-18137 Open self profile when using app/openfloater/profile
2022-09-13 13:04:59 +03:00
55da4ea8bb
Merge branch 'master' into DRTVWR-565-maint-P
...
# Conflicts:
# indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31 00:36:22 +03:00
d19d827121
Merge branch master (DRTVWR-483) into DRTVWR-559
...
# Conflicts:
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllocalbitmaps.h
# indra/newview/llviewerregion.cpp
# lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-31 00:30:49 +03:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
fcb3b6917c
SL-17670 Simplify outfit snapshot floater
2022-07-19 18:56:59 +03:00
ad533fcd6b
SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.
2022-06-14 23:39:11 -05:00
dfa71e2bb5
SL-17490 Only update a subset of textures each frame and remove dead debug code.
2022-05-31 11:57:15 -05:00
4ffc6c3fde
SL-15312 Tweaks and fixes
...
- Allowed resizing text fields for classifieds in profiles
- Fixed mislabeled floater from picks to classifieds
- Fixed classified floater's title
- Added support to see multiple classifieds
- Removed obsolete panels
- Fixed pick requests for various menus
- Fixed pick creation from landmarks
- Improved online status handling
- Updated headers in files
2022-05-31 01:47:30 +03:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
5b04123aec
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
...
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
2022-01-21 10:33:37 -06:00
b33e18585d
Merge branch 'master' into DRTVWR-483
2021-12-26 14:00:00 +02:00
2c3fb3d59b
Merge branch 'master' into DRTVWR-539
2021-12-20 14:15:49 +02:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
Andrey Lihatskiy