e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
23e2dcce9d
fixing merge conflicts
2014-08-21 20:59:48 +03:00
f1c43f14b3
MAINT-4218 Adding clothing from inventory closes THAT clothing folder and hides THAT folder
...
fixed issue with 'yet to be started filter' and 'dirty-visible' item.
2014-07-30 18:39:50 +03:00
21a0ea1209
MAINT-4218 Adding clothing from inventory closes THAT clothing folder and hides THAT folder
...
fixed issue with 'yet to be started filter' and 'dirty-visible' item.
2014-07-30 18:39:50 +03:00
4cb5bad705
MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly
...
reverted and remade MAINT-4218
2014-07-29 17:55:06 +03:00
0ea34fba73
MAINT-4289 FIXED [BEAR] Recent Items "Reset Filters" not working correctly
...
reverted and remade MAINT-4218
2014-07-29 17:55:06 +03:00
30c73d0f25
MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder
2014-07-14 12:28:29 +03:00
a718fa91fc
MAINT-4064 FIXED Don't show Folder arrow for folders without visible children.
2014-05-21 12:11:34 +03:00
5956e75e17
MAINT-4064 FIXED Don't show Folder arrow for folders without visible children.
2014-05-21 12:11:34 +03:00
c3173716e2
MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder
2014-07-14 12:28:29 +03:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
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
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
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
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
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
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
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
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
64c5afa196
Merge latest viewer-release with FBC
2013-10-23 14:14:36 -07:00
63cc379c72
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
2013-10-04 02:50:50 +03:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
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
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
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
00275301fc
ACME-275 : Fixed! Filtering on FB list works (tested with simulated data only so far)
2013-05-06 18:31:27 -07:00
ad12517329
ACME-275 : WIP : Filtering
2013-05-03 17:03:37 -07:00
03ad10d258
CHUI-849 : WIP : Filter limit on time instead of number of items
2013-04-18 19:46:08 -07:00
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
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
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
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
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
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
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
0e012f6477
Re-apply marking of special protected Firestorm folders in general purpose manner
2013-07-07 00:28:17 +02:00
6f9fa5bd06
Fix ugly forward dependency in llfolderviewitem.cpp
2013-07-06 21:05:12 +02:00
dbcad8ba6c
Make inventory selection color independent from menu color again
2013-07-06 00:27:12 +02:00
723444f1ce
Fix inventory cut operation highlighting
2013-07-05 23:53:58 +02:00
7631668abd
Some overall fixing of LLUI, re-adding missing stuff and comments
2013-07-01 00:48:14 +02:00
a35c331562
Fix link error by re-adding LLFolderViewItem::handleToolTip
2013-06-30 13:01:20 +02:00
9e879131ea
Re-apply user-definable item height in folder views
2013-06-27 17:00:13 +02:00
c7196a5d4d
Fix llui build
2013-06-26 18:11:11 -06:00
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
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
Ansariel