Commit Graph

167 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Richard Linden 3a0e45ff08 SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
standard naming conventions for handlers vs. reactors
2013-05-10 17:57:12 -07:00
Brad Payne (Vir Linden) 1bf6688561 SH-4128 WIP - rewiring various link-deleting operations to support callbacks 2013-04-23 15:52:12 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden 2e2026a4f8 CHUI-746 : Fixed! Undid the MAINT-2276 hack now that submenus do work thanks to CHUI-682 2013-02-08 20:51:02 -08:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Graham Madarasz (Graham) 2676f516f2 For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted 2013-01-28 10:15:10 -08:00
Merov Linden aabfce7d9f CHUI-682 : Fixed : Added LLMenuGL as a possible child of a toggle or contextual menu (for dynamic submenus). 2013-01-17 21:40:49 -08:00
Merov Linden 90adfec715 CHUI-682 : WIP : Instrument the menu display (or lack thereof). 2013-01-16 19:22:36 -08:00
Richard Linden 3882e9c177 CHUI-101 WIP Make LLFolderview general purpose
more compilation fixes, just need to add getName() back to LLInventoryFilter et al
2012-06-20 00:19:05 -07:00
Richard Linden 379eec8841 CHUI-101 WIP Make LLFolderView general purpose
continuing fixing build errors
renamed llfoldervieweventlistener.h to llfolderviewmodel.h
2012-06-15 13:35:39 -07:00
Richard Linden 9940ca5ae7 CHUI-101 WIP Make LLFolderView general purpose
llfolderview refactornig
2012-06-15 09:44:27 -07:00
Richard Linden e92d3dcf10 EXP-971 FIX New Direct Delivery item does not sort as most recent item in Recent Tab if that tab is open when item delivered 2011-07-05 23:40:19 -07:00
Oz Linden b2ade764a9 merge latest avatar-physics updates 2011-03-24 13:25:12 -04:00
Mark Palange (Mani) 9775b80fef Code fixes for VS2010 compatibility 2011-01-21 14:25:33 -08:00
Oz Linden ad99134668 Automated merge with file:///Users/oz/Work/viewer-development 2010-12-14 22:59:36 -05:00
Oz Linden efa42a6aab merge up to viewer-development 2010-12-04 09:14:58 -05:00
Richard Linden d276950c8d build fixes 2010-11-15 17:03:52 -08:00
Merov Linden 3116e0d352 STORM-426 : merge with viewer-development 2010-10-25 13:43:22 -07:00
Vadim ProductEngine ba0d4ccaf4 STORM-341 FIXED Crash on exiting viewer while Outfit Editor is opened in detached Appearance SP.
Reason: An inventory observer (LLFilteredWearableListManager) tried to use
a deleted collect functor (LLFilterItem::collector in LLPanelOutfitEdit::mListViewItemTypes).

Fix: De-register (and delete) the observer when the collector gets deleted.
2010-10-25 21:38:22 +03:00
Seth ProductEngine 54da19fdcf STORM-426 FIXED Menu button no longer looked pressed while its menu is displayed by another control.
- LLMenuGL in menu button replaced by LLToggleableMenu that handles visibility change upon clicks inside specific button rect.
- Added visibility change signal to LLToggleableMenu to update menu button pressed state.
- Added using menu handle in LLMenuButton.
2010-10-22 02:08:26 +03:00
Seth ProductEngine c12c60df4a STORM-263 FIXED popup menu of Cog button in lower-left of sidebar panel closing on second click
- Changed type of gear menu buttons from LLButton to LLMenuButton in all sidebar panels where gear menu button is used.

- Added setMenuPosition(), setMenu() and updateMenuOrigin() to the LLMenuButton.

- Moved actions common for displaying a context menu to LLMenuButton::toggleMenu().

- In all sidebar panels where LLButton was replaced with LLMenuButton the following steps were taken:
    1. setting gearMenu and its position relative to the menuButton with LLMenuButton::setMenu()
    2. setting mouse down callback for the menuButton if needed.
    3. calculating the menu origin point with LLMenuButton::updateMenuOrigin() in mouse down callback
2010-10-15 00:10:55 +03:00
Loren Shih eed7b72011 automated merge 2010-09-08 17:58:17 -04:00
Tofu Linden 7f428e6c86 merge VWR-22724 FIXED Clicking an attachment switched the Add More inventory to Flat view 2010-09-01 16:01:19 +01:00
Paul Guslisty 0e031ba5fa VWR-22724 FIXED Clicking an attachment switched the Add More inventory to Flat view
Added checking when item in COF list selected: IF (FolderListView is shown) THEN (don't switch to the FlatListView AND set proper filter for FlatListView).

Reviewed by Vadim Savchuk
2010-08-31 20:33:49 +03:00
Paul Guslisty 9789192275 VWR-22723 Add More category picker defaults whenever a clothing item is removed
- After wearable removed from COF list, check: whether any outfit of the same wearable type as removed left in COF. If left then select it.
- Added method selectClothing(LLWearableType::EType) to the LLCOFWearables that selects first clothing from COF of specified WearableType

Reviewed by Vadim Savchuk
2010-08-31 19:42:46 +03:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -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
Loren Shih 981a43b355 Created new wearable type.
Added debug setting for disabling physics.
Added disable-multiwear and disable-camera-reset to wearabletype.
2010-08-23 16:13:10 -04:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Tofu Linden c574a819ec Fix a bunch of typos in new enums, one of which was causing a build failure. 2010-08-12 14:20:33 +01:00
Tofu Linden 98870dfa24 merge from viewer-release 2010-08-12 12:53:53 +01:00
Paul Guslisty 7a0b016c8c EXT-8205 FIXED (Items in \"Add more\" panel are not sorted by name)
- Modified LLWearableItemTypeNameComparator so that it can be more reusable and adjustable

- Set LLWearableItemTypeNameComparator for WearableItemsList ('List view' of 'Add More' panel) due to sort clothings by name

- Modified and applied patch form https://codereview.productengine.com/secondlife/r/620/diff/2/#index_header. This patch was discarded because specification was changed

Restored diff after bad merge at 13817

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/765/

--HG--
branch : product-engine
2010-08-12 13:48:36 +03:00
Tofu Linden f0b1424cb8 merge from viewer-release 2010-08-07 12:46:27 +01:00
Paul Guslisty c187fdcf1f EXT-7963 FIXED (Edit Outfit > Add More > Do not switch to next item type after add/replace)
- Added selected item type (in flat list view) as criterion when determining filter type in 'Add More' panel

- Fixed LLAccordionCtrl::getSelectedTab() method. When 'selection_enabled = false' for LLAccordionCtrlTab, LLAccordionCtrl::getSelectedTab() returned NULL, even if some accordion tab was selected. Now it's OK. Method returns currently selected LLAccordionCtrlTab.

Recovered from bad merge in 13811

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/790/

--HG--
branch : product-engine
2010-08-06 19:41:23 +03:00
Tofu Linden 07f668fe2b fix a merge conflict I forgot to commit earlier. 2010-08-05 13:31:19 +01:00
Tofu Linden b68f753a75 (hairy) merge from viewer-release 2010-08-05 12:42:12 +01:00
Brad Payne (Vir Linden) e6d5cc3bd1 EXT-8283 FIX, EXT-8360 FIX - original fixes got broken, presumably during some merge 2010-08-04 17:21:33 -04:00