Commit Graph

203 Commits

Author SHA1 Message Date
Router Gray
1ece0e6051 [UI] Add Copy Folder UUID to inventory actions 2020-02-19 12:40:33 -06:00
Router Gray
68481b8921 [Notifications] Make cpp agree with xml to fix Restore In World confirmation on no-copy inventory items.
Thanks Torric Rodas for reporting.
2019-10-24 22:49:06 -04:00
Liru Færs
7c89a8b178 Remove old pointless code
Somehow fixed my BOM crash
2019-10-11 03:42:20 -04:00
Router Gray
df13aa408b Add missing operand in inventory actions. 2019-05-24 12:06:33 -05:00
Lirusaito
8653ee79ea Update Floater Inv Panel to be more modern 2019-04-28 09:02:43 -04:00
Lirusaito
a1d06e682e Switch to using typedef'd uuid types everywhere and auto for iterators
Oh, and some related opts.
2019-04-04 22:20:21 -04:00
Lirusaito
3d8e05fa2a Remove ze gestures 2019-03-22 18:02:33 -04:00
Lirusaito
4069878d54 [VMM] Fix inventory management bug reported by Griss Alexandre 2019-03-13 16:34:31 -04:00
Lirusaito
77eb745abc Fix notification bugs, sync with upstream, yaaay 2019-03-07 17:06:38 -05:00
Lirusaito
c6cc69b01b [VMM] Added Feature "Copy Listing ID"
Take it from me, LGPL or whatever, I don't care, this is QoL
2019-03-07 14:08:19 -05:00
Lirusaito
c7de0ccf99 Sync llinventorybridge and fix activate listing not working 2019-03-07 13:20:16 -05:00
Lirusaito
1d0214ed54 Remove the Outbox
Goodbye, old friend.
2019-03-03 16:39:16 -05:00
Lirusaito
fb39f2d511 Merge branch 'master' into ManagedMarketplace
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h
2019-02-28 23:58:08 -05:00
Lirusaito
8e18f2ab43 So sick of these EEP warnings in my log, add the asset types 2019-02-28 20:09:00 -05:00
Lirusaito
7071ac29e8 Do Opt Yes 2019-02-25 08:02:11 -05:00
Lirusaito
a62d433262 Favorites on the login screen
Adds some guts for the favorites bar, I'll get to that eventually
2019-02-05 05:17:08 -05:00
Lirusaito
b2eb601fc4 We can move whatever we want into favorites 2019-02-04 19:36:01 -05:00
Lirusaito
d340b74bb9 Silly git, that's not how merges work!
Fix automatic merge errors
Also fix some other compile errors
2019-01-25 19:33:19 -05:00
Inusaito Sayori
7c1af50bda Double check vmm merge against alchemy. (sync) 2019-01-25 19:33:18 -05:00
Inusaito Sayori
fd4155f4b6 Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213 2019-01-25 19:33:17 -05:00
Inusaito Sayori
630819cfe5 Set visible and set frontmost. 2019-01-25 19:33:16 -05:00
Inusaito Sayori
f140b4f35c Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189

mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.

Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~

Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
2019-01-25 19:33:15 -05:00
Inusaito Sayori
167d336274 Up to compile phase
at 20fd3e98b4
2019-01-25 19:32:15 -05:00
Shyotl
1230748ef5 Alchemy llcharacter and llcommon merge pass. 2017-03-31 02:08:03 -05:00
Shyotl
7dd616357f Match AISAPI refactoring. 2017-03-13 23:58:56 -05:00
Lirusaito
f33429f1bb Buncha pointless sync and cleanup 2016-05-27 12:17:30 -04:00
Lirusaito
a388ddb0d0 More of the last, this time update llattachmentsmgr.cpp to the latest.
Hopefully it'll compile now?
2016-05-26 11:03:08 -04:00
Shyotl
899ba7fded Fixed folder collapse state not being properly restored after clearing search string.
Updated inventory filter classes.
LLInventoryView renamed to LLPanelMainInventory for easier diffing.
2016-05-26 02:22:19 -05:00
Lirusaito
d15ac7640c More C++11 cleanups, mostly from alchemy 2016-02-22 22:47:01 -05:00
Inusaito Sayori
ed701f9c88 Compiler fixies 2015-10-05 15:08:47 -04:00
Inusaito Sayori
b21dbc46bb Cleanup cof_pending code and attempt to restore old bodypart adding behavior. 2015-09-11 17:26:24 -04:00
Inusaito Sayori
b16058dc83 Remove no-link support more. 2015-08-12 20:08:43 -04:00
Inusaito Sayori
773a2a3855 There are no grids that don't support links.
Conflicts:
	indra/newview/llinventorybridge.cpp
2015-08-12 14:58:42 -04:00
Inusaito Sayori
9dadc8c054 Warnings fixes, mostly signed/unsigned mismatch 2015-08-12 14:54:49 -04:00
Shyotl
f5fcf385e4 Experimental disabling of adding/removing wearables when link-creation/old-link-deletion is still pending a response from the server. 2015-07-23 01:35:58 -05:00
Shyotl
dedd75dc4f Implement all aisv3 HTTP requests. Added PATCH and COPY methods. 2015-07-23 01:02:02 -05:00
Shyotl
18ac6dcb60 Fix 'Wear' action if a wearable of that asset id is already worn; option should now be disabled if there's already a worn wearable with a matching assetid that would NOT be replaced by said 'Wear' action. (It should work otherwise). 2015-07-12 02:35:14 -05:00
Shyotl
4cce1f73c8 Remove llwarns spam on rightclick of bodypart in inventory. Also, disabling 'add' option if group selected wearables would exceed wearable limits should not in any way override visibility of that option. 2015-07-12 02:08:14 -05:00
Shyotl
3f3ead0988 Merge branch 'master' into AISv3-WIP
Conflicts:
	indra/newview/llinventorybridge.cpp
2015-06-27 01:30:28 -05:00
Shyotl
a380161283 Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045 2015-06-26 20:59:31 -05:00
Shyotl
1e488fef6d Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
Conflicts:
	indra/newview/llviewerregion.cpp
2015-06-26 20:38:43 -05:00
Shyotl
4d61305095 GCC fixup. 2015-06-26 01:40:01 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -05:00
Inusaito Sayori
91029955f6 In some cases, one may have modular outfits, added to each other; let it be so! 2015-06-19 22:46:56 -04:00
Shyotl
09f4528bfb Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants. 2015-06-19 18:27:21 -05:00
Inusaito Sayori
b11511b7b9 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
2015-06-19 05:42:49 -04:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
b3709a0343 Woops, unused variable! 2015-06-11 08:39:29 -04:00
Inusaito Sayori
eec85de620 Allow operating with linked folders as though they were mostly folders, show clipboard menu entries on all folders (except COF)
Paste pastes into the linked folder, you've been warned.
2015-05-20 13:19:57 -04:00
Lirusaito
be6ad2a919 Add Mouselook IFF from Alchemy!
Also Assorted Code Cleanup and sync with Alchemy
Debug Settings are AlchemyMouselookIFF and AlchemyMouselookIFFRange
Look to see if an avatar is in a nearby region always when checking if they're an estate owner.
2015-03-13 22:16:07 -04:00