summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
AgeCommit message (Collapse)Author
2010-06-18automated mergeLoren Shih
2010-06-16EXT-7734 FIX In-world object properteis often don't show correct informationRichard Nelson
reviewed by Leyla
2010-06-16EXT-7890 FIXED "Open" on folder of in-world contents does nothingLoren Shih
Removed "open" menu option, to be consistent with right-click options on inventory folders elsewhere.
2010-06-16EXT-5342 FIXED Open in Inventory contents does nothing for certain item typesLoren Shih
"Open" is added conditionally based on item type.
2010-06-14mergeDave Parks
2010-06-14re-disabled old style properties floaterRichard Nelson
2010-06-14EXT-7742 WIP "Add to Outfit" type filter should contain items for each ↵Richard Nelson
wearable type and for each category added ability to filter inventory folder view by wearable type
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-06-09EXT-7430 : Create art overlay for inventory icons that are linksLoren Shih
Took out explicit _Link icons and replaced with overlay. Removed links overlays from non-main-inventory-floater panels.
2010-06-08Merge cleanup.Dave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-28CID-481Tofu Linden
Checker: FORWARD_NULL Function: LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory *, LLInventoryObject *) File: /indra/newview/llpanelobjectinventory.cpp
2010-05-25EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.Vadim Savchuk
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/ --HG-- branch : product-engine
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency' Reviewed by Sam/Richard
2010-05-13EXT-4088 : FIXED : INFRASTRUCTURE : Change LLFolderView::getSelectionList to ↵Loren Shih
return a selection Function signature change to return a selection instead of taking one as an argument.
2010-05-11EXT-7306 : FIXED : Add shortcut-style icons for inventory linksLoren Shih
EXT-7312 : FIXED : INFRASTRUCTURE : Cleanup LLPanelObjectInventory Fixed a few minor bugs with LLInventoryIcon being called with incorrect arguments. Big cleanup of LLPanelobjectInventory to make better use of inheritance. Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-05-11EXT-7306 : FIXED : Add shortcut-style icons for inventory linksLoren Shih
EXT-7295 : FIXED : INFRASTRUCTURE : Cleaned up Inventory Icon code Inventory link icons were designed from scratch. Added LLInventoryIcon class and did some major refactoring for how it determines inventory icons from item bridges.
2010-04-14slightly hairy merge from viewer-trunkTofu Linden
2010-04-12Implemented major task EXT-6710(Feature request: Allow drag and drop from ↵Eugene Mutavchi
Inventory panel to Resident Picker) - added handling the drag add drop inventory items to resident picker - added "Share" verb button to the inventory panel which opens resident picker - added "Share" menu item to the individual inventory context menu which acts as verb button Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/215/ --HG-- branch : product-engine
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06sigghhhh, yet more conflict resolution from the viewer-trunk merge. ↵Tofu Linden
actually builds now. let's see if it runs and works.
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-01EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot ↵Loren Shih
instead of passing it along everywhere such as in performAction mRoot is now stored for all LLInventoryBridge types. Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView ↵Loren Shih
*rootFolder" Superficial cleanup - changed all instances to "LLFolderView* root".
2010-03-20mergeDave Parks
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/56/ --HG-- branch : product-engine
2010-03-18Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in ↵Dmitry Zaporozhan
inventory. Added new icon for multi-objects. New icon is used in inventory, object inventory and buy floater. New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply. --HG-- branch : product-engine
2010-03-17Fixed normal task EXT-6021 [HARD CODED] Bubble shown when you mouseover on ↵Mike Antipov
script within Contents is in EN (task inventory) * Added new string name="PanelContentsTooltip into strings.xml * Set this tooltip to LLFolderView inside the Build Tool Note: Fix for localization of default "New Script" name will be fixed in the EXT-5839. Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/43/ --HG-- branch : product-engine
2010-03-16Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).Andrew Dyukov
- Moved hardcoded strings in LLFloaterBuyCurrency::buyCurrency() calls to strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/33/ --HG-- branch : product-engine
2010-03-16fix for normal EXT-6354 [HARD CODED] - Inventory, Filter-popup: Title isnґt ↵Yuri Chebotarev
localized reviwed https://codereview.productengine.com/secondlife/r/35/ --HG-- branch : product-engine
2010-03-10merge from viewer-2-0Tofu Linden
2010-03-09EXT-6030 - [ Assert Failure] Assert in LLFolderViewFolder when select ↵Richard Nelson
inventory folder after moving item between folders reviewed by Leyla
2010-03-08EXT-5867 : Crash when clicking and dragging root folder of object contents ↵Loren Shih
into build floater Simple fix to use dynamic cast - the previous unsafe static cast was treating folders as if they were items and then querying permissions, which don't exist for folders. This code actually existed back in 1.23 but by some stroke of luck worked.
2010-02-19MergeDave Parks
2010-02-18EXT-5440 Deleting Script in Object contents deletes object when using ↵Leyla Farazha
delete key on keyboard reviewed by Richard
2010-02-17merge from viewer2.Tofu Linden
2010-02-17 EXT-2593 Add border to Build > Contents Tabangela
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04EXT-4801 : hitting trash button for trashed items does not delete itemLoren Shih
EXT-4957 : add const correctness for LLFolderViewEventListener::isItemRemovable This checkin affects several files but is a lot less scary than it looks. It's mostly to add const correctness, and to rename isInTrash to isItemInTrash so that its naming is consistent with isItemRemovable/isItemMovable. The only functionality change is to disable the trash button when an item is already in the trash.
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-199Tofu Linden
Checker: RESOURCE_LEAK Function: LLTaskInvFVBridge::removeItem() File: /indra/newview/llpanelobjectinventory.cpp we haven't actually used this new()'d structure, all the way back to 1.23 :/
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-18Some trivial comment/logging typos that were bothering me more than they ↵Tofu Linden
needed to.
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-09EXT-3303 : Crash on select object inventory root folder and hover Build menuLoren Shih
Unsafe cast (which has existed since viewer1.23) was causing crash.
2009-12-09EXT-2827 and fix for delete key not deleting objects while building.James Cook
Object inventory was grabbing edit menu handling during refresh. Put back Angela's code so that Right-click > Remove > Delete is now disabled if you have a single face selected. Fixed LLSelectMgr::contains() for SELECT_ALL_TES case. Reviewed with Richard.
2009-12-07Merge of viewer 2 changesPalmer
2009-12-04merge to pull viewer-2 changes into avpNyx (Neal Orman)
--HG-- branch : avatar-pipeline
2009-12-04Fix linux build, newline at end of fileJames Cook