Commit Graph

141 Commits (ec00f7f14fbf16992b71ddd54e583ba07fdfd523)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Brad Payne (Vir Linden) 0777f53e2f SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents 2012-12-10 14:47:17 -05:00
Don Kjer 64d9705ae2 Expanding region flags to 64 bits. Adding region protocol flags 2012-08-17 03:56:38 +00:00
Richard Linden 4285cc271e CHUI-217 FIX Items are not visible in Merchant Outbox
cleaned up a lot custom code for folder view item creation in inbox and outbox
proper initialization of views from inventory panel starting folder
2012-07-30 15:15:42 -07:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
callum 51f740ca8d MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
2012-07-06 11:31:37 -07:00
Seth ProductEngine 569146f27c CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard. 2012-06-13 21:21:19 +03:00
Merov Linden b4a53226c8 Merge pull from richard/viewer-chui 2012-06-08 10:40:32 -07:00
Seth ProductEngine 9b92235291 CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters.
- Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER.
- Disabled calling card drop support as it is considered obsolete.
2012-06-08 01:08:58 +03:00
Merov Linden 24789f11cc Pull from viewer-experience 2012-03-01 13:31:17 -08:00
Leslie Linden c1e47e0aca EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be copied to Merchant outbox via ctrl-v
* Viewer now applies the same logic as inventory drag and drop to clipboard
  paste operations.
2012-02-02 12:22:00 -08:00
Merov Linden c1636911c8 EXP-1862 : Make LLClipboard an LLSingleton and clean up the internals (set up for toolbar and never used) 2012-02-01 19:09:29 -08:00
Leslie Linden ba41aea4b2 EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* Any drag and drop or copy operation to the merchant outbox that contains one
  or more no-copy items now brings up a single modal dialog prompting the user
  to move the no-copy items to the outbox or to leave them all behind.
2012-01-12 17:01:23 -08:00
Leslie Linden 98a85b1bf2 EXP-1159 FIX -- User can get No transfer items into Merchant Outbox by rezzing object from Outbox, including No Transfer item in contents, and then taking back into Inventory
* Drag and drop to the 3D world is now disabled from the outbox
2012-01-09 13:39:58 -08:00
Leslie Linden 912833bafa EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
* Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with
  folder and item count limitations related to depth and total folder count.
2012-01-04 14:04:32 -08:00
Richard Nelson 740b3547d6 EXP-1303 FIX Drag and dropping button over viewer area can select objects inworld
fixed close button not working on floaters against right edge of window
fixed drag and drop only working once per toolbar button
reimplemented drag and drop threshold
2011-10-06 16:48:19 -07:00
Merov Linden cd467cc34f EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks into the LLToolDragAndDrop system in to support the new AT_WIDGET and SOURCE_VIEWER 2011-10-03 16:27:24 -07:00
Leslie Linden 1c57963673 Removed windows line endings to conform to coding policy. 2011-09-12 11:30:24 -07:00
Leyla Farazha a0a4a3de9b EXP-1068 Disallow marketplace listing of items that are currently being worn 2011-08-23 14:40:51 -07:00
Leyla Farazha 6d7523defc EXP-1068 Disallow dragging of outbox items onto avatar 2011-08-18 11:04:07 -07:00
Richard Linden 2bc6a7ad33 EXP-1100 WIP Show tooltips when drag and drop operations are not allowed
unblock drag and drop tooltips
2011-08-16 15:39:12 -07:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
brad kittenbrink dbc92691a6 Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies. 2011-05-05 17:13:52 -07:00
Seth ProductEngine dff83a1ba0 STORM-1117 FIXED Disabled placing calling cards in prims inventory. 2011-03-30 23:42:13 +03:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Loren Shih 83eb22f736 SH-739 Meshes can no longer be moved into subfolders of the "Meshes" folder
Did this ever work?  The code for handling drag&drop is broken completely for meshes; you can't drag them anywhere in inventory.
Also did some formatting/cleanup of related code.
2011-01-04 18:41:36 -05:00
Loren Shih 7687653871 Automated merge up from viewer-development 2010-10-20 12:18:33 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Dave Parks cf09d6c58a Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater. 2010-09-22 03:04:21 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Tofu Linden a75f44505a CID-512:
Checker: DEADCODE
Function: show_item_sharing_confirmation(std::basic_string<char, std::char_traits<char>, std::allocator<char>>, LLViewerInventoryItem *, const LLSD &, const LLUUID &, const LLUUID &)
File: /indra/newview/lltooldraganddrop.cpp
2010-09-22 13:25:04 +01:00
Sergei Litovchuk 98e6d56beb STORM-159 FIXED Added sharing inventory item by dropping it on resident's Profile SP even when no IM session is started with that resident. 2010-09-18 01:16:50 +03:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks 13202e744c merge 2010-07-14 11:11:31 -05:00
Nyx (Neal Orman) e78f96b2fb EXT-8213 FIX users cannot replace their shape if it does not load
Removed checking for wearables loaded on replacing or adding individual items.
After reviewing the code in depth, we believe this is safe to do,
particularly since we allow the user to replace their outfit from the same state.

Filed a followup issue for later investigation EXT-8231

Code reviewed by Vir and Seraph
2010-07-02 15:55:49 -04:00
Dave Parks 6e37ec08f6 Builds with LLConvexDecompInter as a static lib. 2010-06-14 23:13:10 -05:00
Dave Parks f9b13d8f85 Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes. 2010-06-10 00:45:48 -05:00
Dave Parks f461ae214c Merge with render-pipeline 2010-06-07 23:05:22 -05:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Alexei Arabadji b41aa1e0b2 EXT-6710 FIXED Added inventory items sharing confirmation and modified alert about non-copy objects sharing.
Current behavior:
* user will be prompted about sharing items regardless is it one or more items;
* user will be prompted about trying to share one ore more non-copy items;
* in case user tries to share non-copy items among with copy items — copy  tems will be shared and user will be prompted about sharing non-copy items

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/

--HG--
branch : product-engine
2010-06-01 14:13:56 +03:00
Mike Antipov 5c370550bf EXT-6710 WIP Prepare to implementation - "Give inventory" related functionality was moved from the LLToolDragAndDrop to a separate class - LLGiveInventory.
To allow give several inventory items to several selected residents I need some functionality encapsulated in LLToolDragAndDrop class out of it.
No functionality should be changed.

LLToolDragAndDrop was updated to use new LLGiveInventory'methods instead of removed ones.

There were moved methods related to:
 - give inventory item
 - give inventory category
 - log into chat
Such functionality was moved:
 - is give acceptable
 - do inventory give operation
 - send give inventory request to server
 - process give inventory for protected items

QA Notes: Functionality related to give inventory via drag and drop should be re-tested closely.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/364/

--HG--
branch : product-engine
2010-05-21 13:16:29 +03:00
Tofu Linden 168ef83bcf slightly hairy merge from viewer-trunk 2010-04-14 10:18:13 +01:00
Loren Shih 5d3de2ea03 EXT-6745 : Refactor LLFetchComboObserver to use LLFetchItems and LLFetchDescedents instead of code duplication
Took out a bunch of code duplication from the FetchComboObserver and am using the LLFetchItems/DescendentsObservers instead.  Also added some comments and made some minor superficial cleanup to LLInventoryObserver done().
2010-04-07 13:30:21 -04:00
Loren Shih e9f0676441 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
Minor cleanup of LLInventoryFetchComboObserver
2010-04-07 11:15:27 -04:00
Loren Shih f096f02278 EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06 18:58:26 -04:00
Loren Shih cdbdb11686 EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
2010-04-06 14:47:20 -04:00