summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelobjectinventory.cpp
AgeCommit message (Collapse)Author
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.