Commit Graph

134 Commits (230d22ceb2ccc9e82aec0a37f1647636fb5ee310)

Author SHA1 Message Date
Merov Linden b85cf7b125 Pull update from viewer-development 2010-09-24 11:23:07 -07:00
Vadim Savchuk 483e22a64d STORM-166 FIXED Memory leak in LLSelectNode constructor.
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-21 17:41:53 +03:00
Merov Linden 24473fc0d6 STORM-161 : Reimplement hide object selection 2010-09-16 15:31:07 -07:00
Merov Linden 786df38c2a SNOW-681 VWR-1852 : Local ruler mode aligned incorrectly for linked objects 2010-08-31 21:36:45 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Vadim Savchuk 62466c0704 EXT-8577 WIP Context menu items for multi-attachments.
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-08-06 17:14:01 +03:00
Loren Shih 1a2a25cb85 EXT-7747 FIXED Turn on multiattachments for 2.1 as debug setting
This #ifdef is now keyed to MultipleAttachments debug setting
2010-06-24 17:38:12 -04:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Loren Shih 6e4fd99df8 Various fixes for multi-attachments support. Ported over from https://hg.lindenlab.com/seraphlinden/seraph-viewer-for-server-1.40/ 2010-04-21 17:03:04 -04:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Loren Shih b952a5e585 EXT-6479 : Inspect Object floater doesn't update highlight and selection
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-19 13:21:39 -04:00
Loren Shih 2a3c30dc7c EXT-6479 : Inspect Object floater doesn't update highlight and selection
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-03-19 11:48:00 -04:00
Dave Parks 4538bdd8e9 Fix for bad GL blend function caching. 2010-02-06 20:50:49 -06:00
Rick Pasetto 9dd41cdcee EXT-3144 EXT-4226: Re-employ tentative state for individual items in media 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-02-04 11:24:54 -08:00
Tofu Linden 3d8bd2b166 CID-351
Checker: UNINIT_CTOR
Function: LLSelectMgr::LLSelectMgr()
File: /indra/newview/llselectmgr.cpp
2010-01-28 11:52:38 -08:00
Tofu Linden bfd21c0886 CID-384
Checker: UNINIT_CTOR
Function: LLSelectNode::LLSelectNode(const LLSelectNode&)
File: /indra/newview/llselectmgr.cpp
2010-01-27 16:20:44 -08:00
Brad Payne (Vir Linden) 9813df87af merge
--HG--
branch : avatar-pipeline
2009-12-16 11:43:08 -05:00
Brad Payne (Vir Linden) adec0ba983 For EXT-3114: [BSI] Can't right click > edit a no-mod attachment
--HG--
branch : avatar-pipeline
2009-12-16 11:34:46 -05:00
Loren Shih 0d186b0712 Dos2Unix fix for llselectmgr.cpp 2009-12-10 14:03:19 -05:00
James Cook dab87201cd Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
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-09 16:37:08 -08:00
James Cook 3476116de8 EXT-2827 and fix for delete key not deleting objects while building.
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-09 13:06:07 -08:00
James Cook a65473957f Back out EXT-2827 Unable to delete object when select face of object
May cause right-click delete to fail - testing that
Backed out changeset: 1f8e1e73f9f4
2009-12-08 16:28:34 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
angela 5d4959e3a1 EXT-2827 Unable to delete object when select face of object 2009-12-04 22:25:12 +08:00
James Cook 7d3b3cc474 Linker optimization - use "extern template" for commonly regenerated templates
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
James Cook f280c43d61 Use extern template for common singletons to reduce code bloat/link time. 2009-11-28 16:51:02 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Loren Shih 9c048d12fd merge
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
Monroe Linden 44fc2e5ba3 Restore the media focus ring. This fixes DEV-42166.
Media focus is still tracked separately from LLSelectMgr (which was a change made during a refactor a while ago), but LLViewerMediaFocus now keeps LLSelectMgr updated with the current media focus when it changes.

Added a special case for media focus to LLSelectMgr::deselectAllIfTooFar(), since it was making the focus ring not show up when media focus was on distant media.
2009-11-05 14:18:16 -08:00
Loren Shih 280e017291 EXT-2229 : Task SP : Update task on new selection
Using activePanel hack to update selection when it changes.

--HG--
branch : avatar-pipeline
2009-11-05 15:00:36 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
Leyla Farazha 43c5ab0be2 EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810   	 Right clicking own avatar displayed semi-transparent menus
EXT-1927   	 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
2009-11-02 14:11:07 -08:00
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07:00
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
James Cook a4c657a49d Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. 2009-10-16 23:20:05 +00:00