Skip to content

SL-20109 -> Maint Y merge #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 25, 2023
Merged

SL-20109 -> Maint Y merge #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2aecd42
First commit of code to investigate how we might do bulk uploads of i…
callumlinden Aug 1, 2023
57b9500
Merge remote-tracking branch 'origin/DRTVWR-567' into viewer_bulky_th…
callumlinden Aug 1, 2023
4ce1463
SL-20109: write the name of each copied inventory item to the text ed…
callumlinden Aug 1, 2023
feb40d1
SL-20109: display the inventory item asset ID and associated thumbnai…
callumlinden Aug 2, 2023
03ca946
SL-20109: now lets user copy a list of items or list of folder of ite…
callumlinden Aug 3, 2023
c92d6e3
SL-20109: Hacked in some code to write thumbnails now - had to change…
callumlinden Aug 3, 2023
263e097
SL-20109: Big clean up. Now supports arbitrary mix of folders and ent…
callumlinden Aug 4, 2023
7d84981
Merge remote-tracking branch 'origin/DRTVWR-567' into viewer_bulky_th…
callumlinden Aug 11, 2023
2d39f05
SL-20109: Now that it seems that the tool might be useful, make a ne…
callumlinden Aug 12, 2023
abb8d04
SL-20109: Some small UI tweaks before moving onto the meat of the fun…
callumlinden Aug 12, 2023
cf60c97
SL-20109: New, helper version coming together slowly modulo XUI pain
callumlinden Aug 15, 2023
dde395d
Merge remote-tracking branch 'origin/DRTVWR-567' into viewer_bulky_th…
callumlinden Aug 17, 2023
10276ee
Small updates to bulky thumbs but mainly, this is about the first ver…
callumlinden Aug 17, 2023
d314751
Remove the original prototype tool Bulky Thumbs since it is now super…
callumlinden Aug 17, 2023
2830d5c
Merge remote-tracking branch 'origin/DRTVWR-567' into viewer_bulky_th…
callumlinden Aug 21, 2023
d2bb4cd
SL-20172: Add in an 'Are you sure Y/N' type dialog before writing thu…
callumlinden Aug 21, 2023
82ee49a
SL-20172: I missed a closing angle brace after adding a new XML notif…
callumlinden Aug 21, 2023
327f1b8
Merge branch 'viewer_bulky_thumbs' into marchcat/maint-Y-bulky-thumbs
marchcat Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions indra/newview/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ set(viewer_SOURCE_FILES
llfloaterimcontainer.cpp
llfloaterinspect.cpp
llfloaterinventorysettings.cpp
llfloaterinventorythumbnailshelper.cpp
llfloaterjoystick.cpp
llfloaterlagmeter.cpp
llfloaterland.cpp
Expand Down Expand Up @@ -880,6 +881,7 @@ set(viewer_HEADER_FILES
llfloaterimcontainer.h
llfloaterinspect.h
llfloaterinventorysettings.h
llfloaterinventorythumbnailshelper.h
llfloaterjoystick.h
llfloaterlagmeter.h
llfloaterland.h
Expand Down
Loading