summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
AgeCommit message (Collapse)Author
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
2009-12-04 Deleting content inside a prim from build floater deletes prim, rather than ↵angela
content EXT-2575
2009-12-03EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate ↵Loren Shih
various filter options EXT-3124 : Add lookup for finding all linked items to an item LLInventoryFilter cleanup, including adding ability to lookup item by UUID. --HG-- branch : avatar-pipeline
2009-12-03 EXT-2575 [BSI] Deleting content inside a prim from build floater deletes ↵angela
prim, rather than content
2009-12-02CTS-37 Mesh-type assets can't be added to the inventory of a primKarl Stiefvater (qarl)
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
Fixed many other includes related to this file. Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-23Add damage % text to nav bar, clip text entry to avoid overlapping iconsJames Cook
Fixed includes of llmenugl.h / llnotifications.h Note: Clipping is incorrect, I think due to line editor bug.
2009-11-19EXT-2490 Right click context menu for objects should include build toolsLeyla Farazha
EXT-2541 Help > Report Abuse screenshot not showing up EXT-2549 Crash on exit from mouse-look (Mini Map related) EXT-2548 Viewer freezes when going out of the mouselook while there are more than two floaters EXT-1983 [BSI] Trying to edit a script in a no mod object pops up script editor with "object out of range" reviewed by Richard
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
2009-11-11EXT-2051 Add tooltip to inventory items showing their full namesangela
2009-11-09EXT-1866 : Inventory Side PanelLoren Shih
Various trivial UI behavioral changes for disabling/enabling old/new floaters when bringing up properties of objects/items. This is to make the UI behavior compliant with the Inventory Panel MVP. Also added missing sidepanel_task_info.xml (although this is not actually enabled for viewer2.0).
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-03update from viewer2 and merge into avpEric M. Tulla (BigPapi)
--HG-- branch : avatar-pipeline
2009-11-03EXT-2131 : object properties sidepanelLoren Shih
EXT-2128 : remove multi-properties ability, disable from inventory menu Also includes llsidepanelinventory cleanup. --HG-- branch : avatar-pipeline
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel Porting over changes from svn Inventory Panel work.