summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2014-02-11mergeBrad Payne (Vir Linden)
2013-12-17merge fixBrad Payne (Vir Linden)
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-03SH-4640 WIP - use backlinks in inventoryBrad Payne (Vir Linden)
2013-12-03SH-4640 WIPBrad Payne (Vir Linden)
2013-11-27STORM-1986 Eliminated early return per code reviewJonathan Yap
2013-11-26STORM-1986 Added right click Show on Map context menu for Inventory floater ↵Jonathan Yap
landmarks Possible fix for BUG-4593
2013-11-25SH-4549 FIX - code cleanupBrad Payne (Vir Linden)
2013-11-23SH-4611 FIX - use an observer to scroll after category rename completesBrad Payne (Vir Linden)
2013-11-06merge with releaseRichard Linden
2013-10-29Merge viewer-release => sunshine-internalDon Kjer
2013-08-19MergeXiaohong Bao
2013-08-16merge with viewer-releaseNyx Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09Refactoring link creation calls in preparation for adding AIS v3 hook.Don Kjer
2013-08-05merge changes for 3.6.2-releaseOz Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-07-11Merged in viewer-releaseAura Linden
2013-06-27SH-4300 WIP - added callback for a non-callback case of ↵Brad Payne (Vir Linden)
updateClothingOrderingInfo. Also removed some wrong code for drag-and-drop corresponding to a case that's not allowed anyway.
2013-06-26SH-4305 WIP - cleanupBrad Payne (Vir Linden)
2013-06-20merge with releaseRichard Linden
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-24SH-4027 WIP - initial implementation of item update via AIS.Brad Payne (Vir Linden)
2013-05-16SH-4168 FIX Inventory: Loading... Loading... shown on foldersRichard Linden
cleaned up logic for displaying "loading..." message so that it only applies to folders that are opened whose contents aren't yet loaded
2013-05-16Removed debugging.Aura Linden
2013-05-15SH-4175 WIP - Avoid add to outfit or remove from outfit when an outfit ↵Brad Payne (Vir Linden)
change is already in progress
2013-05-13SH-4168 WIP, SH-4155 WIP - update inventory model based on ais returns, try ↵Brad Payne (Vir Linden)
to maintain loading... string more consistently in folder bridge
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
2013-04-25SH-4137 WIP - added callback-based support for purge descendents, remove ↵Brad Payne (Vir Linden)
category
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-18merge up to 3.5.0-beta3 (chui)Oz Linden
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-02-05CHUI-730 : Fixed! Only clear out More sub menus in inventoryMerov Linden
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-26STORM-1838 Add code for right click menu on inventory calling cards.Jonathan Yap
Add initial support to insert teleport request into existing IM window.
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-09CHUI-649 : WIP : Cleanup code to make it readableMerov Linden
2012-12-17CHUI-580 : WIP : Protect callback connections passed to ↵Merov Linden
LLAvatarNameCache::get() where necessary
2012-12-10SH-3606 WIP - replaced several LLInventoryCallback subclasses with ↵Brad Payne (Vir Linden)
boost::func equivalents
2012-12-05Pull merge from dev repoMerov Linden
2012-12-05CHUI-580 : WIP : Change the display name cache system, deprecating the old ↵Merov Linden
protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05CHUI-509 : Fixed : Add params to inventory widgets to control font colors ↵Merov Linden
(required for library items and links).
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-14CHUI-508 FIXED Attach to and Attach to HUD menus not showing in inventory ↵maksymsproductengine
floater to select attachment point