Commit Graph

95 Commits (d0a51da8942c1908ecad3f718cf620dafd96c511)

Author SHA1 Message Date
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07: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
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 697d2e720b renamed TimeBlock to BlockTimerStatHandle 2013-10-15 20:24:42 -07:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
Richard Linden 12f0f8cb72 changed over to manual naming of MemTrackable stats
changed claimMem and disclaimMem behavior to not pass through argument
added more mem tracking stats to floater_stats
2013-10-01 13:46:43 -07:00
Richard Linden 053d97db1b better memory usage for LLTrace (tighter packing of recording arrays)
removed complicated and unnecessary fast timer gapless handoff logic (it should be gapless anyway)
improved MemTrackable API, better separation of shadow and footprint
added memory usage stats to floater_stats.xml
2013-09-25 19:12:35 -07:00
Richard Linden ab8f64a967 converted memory tracking units to KB from B
added more memory tracking to LLFolderView and kin
2013-09-24 00:05:43 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Richard Linden cbe397ad13 changed fast timer over to using macro
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08: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 a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Gilbert Gonzales 359c3d520e ACME-342 Format the PersonView so that it shows the avatar icon, SL name, FB icon, and FB name: Rendering now matches the UX spec. 2013-05-09 16:02:03 -07:00
Merov Linden 00275301fc ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only so far) 2013-05-06 18:31:27 -07:00
Merov Linden ad12517329 ACME-275 : WIP : Filtering 2013-05-03 17:03:37 -07:00
Merov Linden 03ad10d258 CHUI-849 : WIP : Filter limit on time instead of number of items 2013-04-18 19:46:08 -07:00
Merov Linden e84c97e86d CHUI-912, CHUI-849 : Propagate arrange request correctly, limit sort, improve filter perf, clear traces, add comments. 2013-04-16 19:24:47 -07:00
Merov Linden b05bf882db CHUI-912 : WIP : Fix resize test when folder is empty, add more traces (to be deleted) 2013-04-11 19:02:16 -07:00
Merov Linden d533a33f42 CHUI-912 : WIP : Add traces to various aspects of the inventory filtering, sorting and arranging (to be deleted) 2013-04-08 18:59:21 -07:00
Simon Linden d5561a1ada Merge in viewer-beta to get CHUI code 2013-03-19 16:20:53 -07:00
Mnikolenko ProductEngine 9530b9d2b7 CHUI-694 FIXED Handle ALT + Up/Down and ALT + Right/Left to switch conversations in the list. Handle ALT + Enter to expand participant list of selected conversation. 2013-03-01 14:24:47 +02:00
Tank_Master 0a1a351b86 Merge Viewer-Share 2013-10-21 23:51:34 -07:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Ansariel 23a166a76e First fix for messed up inventory folderview indentation; folderview is still shifted 4 pixels to the left... 2013-07-07 16:36:11 +02:00
Ansariel 0e012f6477 Re-apply marking of special protected Firestorm folders in general purpose manner 2013-07-07 00:28:17 +02:00
Ansariel 6f9fa5bd06 Fix ugly forward dependency in llfolderviewitem.cpp 2013-07-06 21:05:12 +02:00
Ansariel dbcad8ba6c Make inventory selection color independent from menu color again 2013-07-06 00:27:12 +02:00
Ansariel 723444f1ce Fix inventory cut operation highlighting 2013-07-05 23:53:58 +02:00
Ansariel 7631668abd Some overall fixing of LLUI, re-adding missing stuff and comments 2013-07-01 00:48:14 +02:00
Ansariel a35c331562 Fix link error by re-adding LLFolderViewItem::handleToolTip 2013-06-30 13:01:20 +02:00
Ansariel 9e879131ea Re-apply user-definable item height in folder views 2013-06-27 17:00:13 +02:00
Cinders c7196a5d4d Fix llui build 2013-06-26 18:11:11 -06:00
Ansariel 8d01b45708 Re-apply FIRE-6714: Don't move objects to trash during cut&paste (untested so far) 2013-06-26 23:19:02 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett 9177903931 Merged with Appearance-MixedViewers tip
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
Merov Linden 45e72bf3cb Pull merge from richard/viewer-chui 2013-01-10 11:49:29 -08:00
Merov Linden be3cfd872b CHUI-649 : WIP : Cleanup code to make it readable 2013-01-09 20:20:32 -08:00
Merov Linden 60eaa8875d CHUI-652 : Fixed : Maintain multi selection consistent when click and drag an already selected item (drag multi select was broken) 2013-01-09 19:10:41 -08:00
maxim@mnikolenko 856969285e CHUI-658 FIXED Don't highlight whole content of the folder after right clicking if it is flashing. 2013-01-10 14:56:33 +02:00
Merov Linden 0e7e877379 CHUI-659 : WIP : Cleanup llfolderviewitem of filter code as it all moved into llfolderviewmodel. 2013-01-07 19:12:32 -08:00
Merov Linden d71c0ab32c CHUI-659 : WIP : Clamp down on the number of rearrange we really need. 2013-01-07 18:30:59 -08:00
Merov Linden e32f110b9a Pull merge from richard/viewer-chui 2012-12-19 11:04:24 -08:00
Merov Linden 8adca4583e CHUI-600 : WIP : Flash conversation item in different color than select and start flashing only when shown 2012-12-18 22:57:56 -08:00
AlexanderP ProductEngine d2102c9b9f CHUI-601 : Fixed : Crash when dismissing a conversation while a participant is selected
DeletePointer() for the items was replaced by Function LLFolderViewItem::destroyView():
Function LLFolderViewItem::destroyView(), before removing the item, immediately removes it from the Selection List of the Root Folder. As a result, at the time of the call of sanitizeSelection(), will not need to try to handle the elements that have already been deleted.
2012-12-19 17:26:55 +02:00