summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Collapse)Author
2013-11-06merge with releaseRichard Linden
2013-08-19MergeXiaohong Bao
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
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-20merge with releaseRichard Linden
2013-06-13merge changes for 3.5.3-releaseOz Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-16Removed debugging.Aura Linden
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
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
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-09CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and ↵AlexanderP ProductEngine
in accordance with the naming convention in the project, some classes and corresponding files should be renamed: LLIMConversation -> LLFloaterIMSessionTab LLIMFloater -> LLFloaterIMSession LLNearbyChat -> LLFloaterIMNearbyChat LLIMFloaterContainer -> LLFloaterIMContainer LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-08CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now ↵William Todd Stinson
refers to it as Do Not Disturb mode.
2012-10-26CHUI-383: Realized that prior changes for this bug caused a regress. The ↵Gilbert Gonzales
regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater.
2012-10-17CHUI-394 FIXED Group moderation tools missing in right click menusmaksymsproductengine
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-03CHUI-354 FIXED getIconOverlay() is added for LLItemBridgemaxim_productengine
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04CHUI-303: Problem was that the prior solution only updated (using ↵Gilbert Gonzales
dirtyFilter()) the inventory window that the paste occurred in. Resolution: Now each inventory window calls dirtyFilter(), which then determines visibility of the pasted item.
2012-09-03Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-09-03Extracted texture baking system into llappearance library.Don Kjer
2012-08-24merging in latest changesGilbert Gonzales
2012-08-24kicking off another build (whitespace change)Gilbert Gonzales
2012-08-23CHUI-303: Problem: When pasting the item, the item's filtering flag was not ↵Gilbert Gonzales
updated. The filtering flag determines visibility. Resolution: Upon pasting the item to the folder from the clipboard, update the filtering flag so that visibility can properly be determined.
2012-08-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-21SH-3625 WIP - consolidating code paths for removal, removed dead codeBrad Payne (Vir Linden)
2012-08-21SH-3625 WIP - consolidating code paths for wearable/attachment removalBrad Payne (Vir Linden)