Commit Graph

3409 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Ansariel db68b4d7ea Re-apply performance tweak in LLFlashTimer 2014-06-10 22:26:46 +02:00
Nicky 3b0cf7ef78 Fix merge error and derive LLFolderViewModelItem from FSFolderViewModelItem again. 2014-06-10 21:50:47 +02:00
Nicky 9c7ab535d4 Adjust for changes in LLUI after merge, 2014-06-10 11:17:28 +02:00
Nicky 4a38a5b528 Use LL's code for ::updateClass (LLInstanceTracker functions) again. 2014-06-10 11:03:33 +02:00
Nicky a40d2d1f74 Add missing include of boost/function.hpp. 2014-06-10 11:02:05 +02:00
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master e3ea0378b6 Merge LL 3.7.6 2014-05-17 11:18:52 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Ansariel f5437de5d5 FIRE-7782: Set correct tooltip for dock/tear-off button 2014-04-23 13:48:10 +02:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
Ansariel 153d45a57a Add setLineHeight method to LLScrollListCtrl - this might be handy in the future 2014-04-22 18:00:43 +02:00
simon 0b9a777bfd Merge downstream code updating version to 3.7.7 2014-04-21 12:36:35 -07:00
Ansariel 6c9305620c FIRE-12754: Another attemp at fixing the chat history scrolling issue:
Hack around a weird issue where the doc size magically increases by 1px during
draw if the doc exceeds the visible space and the scrollbar is getting visible.
2014-03-27 11:50:03 +01:00
Ansariel 0a720ab493 Explicitly call LLFloater::storeVisibilityControl() in LLFloater::onClickTearOff() so we don't store stale visibility settings 2014-03-21 12:40:34 +01:00
Ansariel 84920dea7e FIRE-6392 / FIRE-12935: Possible fix for IM/contacts sometimes not preserving dock and visibility state 2014-03-21 09:01:19 +01:00
Ansariel dea6e88878 Remove setEventLoggingOff call in LLViewerEventRecorder now that logEvents is properly initialized 2014-03-18 18:26:16 +01:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
Ansariel 55aa33ae20 FIRE-13129: Ctrl + Shift + W will not close communications floater if an IM tab is open 2014-03-14 09:59:11 +01:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Ansariel e1c2f22607 Merge with latest changes 2014-03-12 20:18:51 +01:00
simon c7aad1f7e3 Merge downstream code to 3.7.4 2014-03-11 10:41:52 -07:00
Merov Linden 5690becdf4 Pull merge from lindenlab/viewer-release 2014-03-10 16:20:09 -07:00
Ansariel cad57f1e23 FIRE-10908: CTRL-W closes multifloater instead of active child floater 2014-03-08 14:08:56 +01:00
Baker Linden 28d3bb0975 [MAINT-3555][MAINT-3703]
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
2014-03-03 11:53:57 -08:00
Northspring 36ebe743b3 Added SNOW and CTS; Fixed typo in the previous commit 2014-03-01 05:25:58 +01:00
Tank_Master d3f98d02b5 Add FITMESH to jira parcer 2014-02-28 18:37:08 -08:00
Ansariel b5dc14199b FIRE-12999: Automatically scroll to selected tab in vertical tabs if it's outside the visible tabs 2014-02-28 08:58:44 +01:00
simon 8b28593c10 Merge downstream code 2014-02-27 13:36:05 -08:00
Simon Linden 0a46023db5 Fix linux build - make default check in switch statement 2014-02-26 23:52:34 +00:00
maksymsproductengine 483ad8dc55 MAINT-3555 FIXED crash in LLPanel::~LLPanel() on shutdown:
- LLFloaterView::mToolbarRects[3] was transformed to LLRect mToolbarLeftRect, mToolbarBottomRect, mToolbarRightRect;
2014-02-26 20:14:41 +02:00
simon 100b9154dd MAINT-3555 : crash in LLPanel::~LLPanel() on shutdown. Fixes to be paranoid
about the return type for calls to LLView::getParent(): never assume a down
cast is possible.
2014-02-26 12:49:29 -08:00
Baker Linden bd73465e51 [MAINT-3784] - Viewer takes too long to shut down
- Removed a lot of logging code to reduce application close time
2014-02-25 16:41:23 -08:00
Merov Linden 245de340d7 Pull merge from viewer-release 2014-02-24 13:23:39 -08:00
simon dd8b32473e Merge downstream code 2014-02-25 16:47:31 -08:00
simon 76913530ed Merge downstream code 2014-02-21 11:10:16 -08:00
Baker Linden 7faaaa9b11 [MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the cause of the crash 2014-02-20 15:23:53 -08:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
maksymsproductengine 1033c9d67f MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
simon 52ce788d0c Pull in viewer-lion to lock down next release 2014-02-18 16:41:21 -08:00
simon 38915f119c More memory cleanup of containers after DeletePairedPointer() usage. 2014-02-14 14:57:08 -08:00
Baker Linden d7b902d575 [MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Kitty Barnett 03319c629b [BUG-4617] Renaming an inventory folder can result in a different folder being moved inside another folder
-> after renaming folder 3 it will actually sort at the top, moving folder 2 to the bottom position
    -> when processing the left-click (onMouseDown) the items will be in their original order and the position saved is in local coordinates
    -> when processing the hover (onMouseHover) the items will have rearranged and even though the mouse hasn't moved, the item has moved
    => result is that since the item moved (relative to the stationary mouse) the viewer interprets it as a drag-and-drop operation
2014-02-04 23:19:36 +01:00
Kitty Barnett 69f7092346 Can't click on a link if there's an active selection in the text editor 2014-02-04 19:43:49 +01:00
maxim@mnikolenko 74c7460846 MAINT-3618 FIXED Don't copy spaces after cursor to the next line. 2014-01-20 12:48:58 +02:00
simon cfadbe631f Revert earlier back-out for MAINT-535 ... it's back in 2014-01-10 13:15:19 -08:00