summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
AgeCommit message (Collapse)Author
2011-04-29Merged with viewer-development.Ricky Curtice
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
2011-04-25Removed an extra variable I'd added.Ricky Curtice
Also cleaned up some whitespace-around-operator issues. While removing the extra variable seems to make the code more ugly, all it does is reveal the pre-existing ugliness that had been masked in the past. Trying to find a fix, or even try to come to a real understanding of why this section of code is the way it is, is out of my scope for this task.
2011-04-05merge changes for STORM-1051Oz Linden
2011-04-04Parenthisized a #define to make it safer, adjusted some notes (and added a ↵Ricky Curtice
TODO) around some extremely obscure code that needs further attention but which is outside this scope.
2011-03-12Switched to using *_SQUARED constants instead of multiplied constants, and ↵Ricky Curtice
cleaned up a few other minor issues noted during review.
2011-03-10Squared all dist_vec() based comparisons and other dist_vec() operations ↵Ricky Curtice
where sensible. Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
2011-02-22STORM-889 FIXED Put Link/Unlink in Edit PanelPaul ProductEngine
- Moved callbacks for Link/Unlink to the LLSelectMgr - Binded Link/Unlink callbacks with buttons in Build Floater - Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-18Cleanup of headless client (was: DisableRendering mode)Don Kjer
* Now called 'HeadlessClient' instead of 'DisableRendering' * Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2010-09-24Pull update from viewer-developmentMerov Linden
2010-09-21STORM-166 FIXED Memory leak in LLSelectNode constructor.Vadim Savchuk
Submitting on behalf of Thickbrick Sleaford. One of the LLSelectNode constructors has a leak where it does "new LLPermisions()" twice, thus leaking the address of the first object created. This constructor is called every time you interact (click, hover, select, possibly other) with an object, once for each prim in the object. Since sizeof(LLPermissions) is 92 bytes, this can be a significant amount after a while. I think this might explain VWR-18528 (leaking LLpemissions instances), at least partially. This was fixed in snowglobe 1.x as part of SNOW-267.
2010-09-16STORM-161 : Reimplement hide object selectionMerov Linden
2010-08-31SNOW-681 VWR-1852 : Local ruler mode aligned incorrectly for linked objectsMerov Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-06EXT-8577 WIP Context menu items for multi-attachments.Vadim Savchuk
Done: - 1. Dropped the obsolete "MultipleAttachments" setting. - 2. Added an "Add" item to the following attachment-related context menus: * My Appearance (ex-My Outfits) context menu. * Edit Outfit -> Add More context menu. * Object in-world context menu. * Inventory context menu. * Object inspector gear menu. - 3. Modified "Attach To / Attach To HUD" to perform the "add" instead of "replace" action. TODO: - Ability to attach multiple objects at once from the Add More panel (bulk attach). - Make sure there's no memleak when you click Wear/Attach in the in-world object context menu and the callback isn't invoked (because e.g. avatar fails to get close enough to the object). Issues: 0. I'm not sure whether LLAgentWearables::userAttachMultipleAttachments() should replace attachments or add them. Assumed the former. 1. I couldn't verify that adding objects from the object inspector menu works because I either could wear an object or see its inspector, not both. 2. > 1. Right-click on an object in your inventory and select "Wear". > VERIFY: Attaches the object and replaces whatever's there; asks for > confirmation before replacing an existing object. I think this is impossible to implement because we don't know in advance what point the object will be attached to, so we can't display a confirmation dialog. Reviewed by Seraph at https://codereview.productengine.com/secondlife/r/843/ --HG-- branch : product-engine
2010-06-24EXT-7747 FIXED Turn on multiattachments for 2.1 as debug settingLoren Shih
This #ifdef is now keyed to MultipleAttachments debug setting
2010-05-04Automated mergeRoxie 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-07Backed out changeset 63b699f90efdTofu Linden
2010-04-01Automated MergeRoxie 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-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-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-06Fix for bad GL blend function caching.Dave Parks
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-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-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-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-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-06mergeLoren Shih
--HG-- branch : avatar-pipeline