summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
AgeCommit message (Collapse)Author
2010-05-15Highlight for object cost and proper retrieval/display of prim object cost ↵Dave Parks
and linkset cost.
2010-05-04Automated mergeRoxie Linden
2010-04-28merge from viewer-trunkTofu Linden
2010-04-21Various fixes for multi-attachments support. Ported over from ↵Loren Shih
https://hg.lindenlab.com/seraphlinden/seraph-viewer-for-server-1.40/
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07merge from viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-01Automated MergeRoxie Linden
2010-04-01MergeMatthew Breindel (Falcon)
2010-03-31MergeMatthew Breindel (Falcon)
2010-03-31DEV-47845 Cleaned up names.Matthew Breindel (Falcon)
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-26DEV-47845 Fix to work with TCP/LLSD message. This checkin is experimental, ↵Matthew Breindel (Falcon)
so if it breaks a build, just revert to the previous changeset.
2010-03-26EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-25automated mergeLoren Shih
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-20mergeDave Parks
2010-03-19EXT-6479 : Inspect Object floater doesn't update highlight and selectionLoren Shih
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Simple fix to only use Inspect floater if it's actually active (i.e. visible).
2010-03-19EXT-6479 : Inspect Object floater doesn't update highlight and selectionLoren Shih
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset) Very simple fix that addresses some brokenness with the inspect multi-object floater. Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out.
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-06Fix for bad GL blend function caching.Dave Parks
2010-02-06Fix for bad GL blend function caching.Dave Parks
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04EXT-3144 EXT-4226: Re-employ tentative state for individual items in media ↵Rick Pasetto
settings Review #95 This change undoes some prior change that seems to not allow showing media data for multiple selection. There was all of this code put in to support displaying tentative state for media, but code was added to basically override it. Perhaps the reason was tentative state items were not ignored on apply...this change does that.
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-28CID-351Tofu Linden
Checker: UNINIT_CTOR Function: LLSelectMgr::LLSelectMgr() File: /indra/newview/llselectmgr.cpp
2010-01-27CID-384Tofu Linden
Checker: UNINIT_CTOR Function: LLSelectNode::LLSelectNode(const LLSelectNode&) File: /indra/newview/llselectmgr.cpp
2009-12-22Added prim cost equivalency to UI for importer and tools floater.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-16mergeBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-16For EXT-3114: [BSI] Can't right click > edit a no-mod attachmentBrad Payne (Vir Linden)
--HG-- branch : avatar-pipeline
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-10Dos2Unix fix for llselectmgr.cppLoren Shih
2009-12-09Partial EXT-3268 Object Profile option showing up in avatar 3D Context menuJames Cook
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no longer pie menus. Created separate other-attachment menus. Reviewed with Richard.
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-08Back out EXT-2827 Unable to delete object when select face of objectJames Cook
May cause right-click delete to fail - testing that Backed out changeset: 1f8e1e73f9f4
2010-03-01Automated merge with a few fixups for code review commentsRoxie Linden
2010-02-26automated mergeRoxie Linden
2010-02-25automated merge from trunkRoxie Linden
2009-12-07Merge of viewer 2 changesPalmer
2009-12-04EXT-2827 Unable to delete object when select face of objectangela
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer. Reviewed with Ambroff
2009-11-28Use extern template for common singletons to reduce code bloat/link time.James Cook
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-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info