cb968152b0
Merge viewer-bear
2016-05-28 14:34:35 +02:00
ca98cd73db
Back out fix to prevent items going to trash during cut&paste - fix from LL is coming in next merge
2016-05-28 13:00:22 +02:00
f3507631ea
linux build fix
2016-05-26 18:26:43 +03:00
7d54c62016
MAINT-6397 cut items should not go to trash
2016-05-25 20:37:52 +03:00
2889c5bf40
Merge viewer-bear
2016-05-09 17:24:00 +02:00
e5048ad8b2
MAINT-6302 FIXED Inventory tree indention displays incorrectly when dragging an open folder into another folder
2016-04-14 13:06:44 +03:00
5fe09cb64d
Merge Viewer-Bear
2015-08-22 03:13:17 +02:00
f94a19e09e
Merge downstream code and become version 3.8.3
2015-08-04 16:45:49 +03:00
fbbc02003d
Merge Firestorm tip
2015-07-20 12:35:36 +02:00
7cd62f4908
MAINT-5274 Missing folder arrow
2015-06-22 19:26:28 +03:00
a82d1242d8
DD-410 : Do not extend inventory selections to items that are not visible
2015-06-11 16:51:24 -07:00
ebf54d4b2d
Merge with Viewer-VMM
2015-07-15 14:23:19 +02:00
bcf5b196fe
MAINT-5205 FIXED ‘Share’ button isn't disabled when worn item and few not worn items are selected
2015-05-12 22:03:06 +03:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
9ba10bf1f2
Merge lindenlab/viewer-tools-update
2015-03-16 09:49:57 -07:00
2e62e7576e
MAINT-5274 Missing folder arrow
2015-06-22 19:26:28 +03:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
b0f590f6ab
Pull merge from lindenlab/viewer-release
2014-12-19 06:00:48 -08:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
4b80a5ed05
Pull merge from lindenlab/viewer-release
2014-09-28 21:40:32 -07:00
23e2dcce9d
fixing merge conflicts
2014-08-21 20:59:48 +03:00
d37c294bd3
DD-75 : Prevent dropping on filtered tabs root. Adding an allow_drop option to inventory tab and folder view folders so that case can be taken into account.
2014-07-30 20:51:18 -07: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
83603fc939
DD-128 : Fixed! Recycled allow_open into allow_wear and use an extra virtual methods on bridge items to know if items are wearable or not.
2014-07-24 17:42:44 -07: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
68b62747ed
Pull merge from lindenlab/viewer-release
2014-05-30 14:19:53 -07:00
a718fa91fc
MAINT-4064 FIXED Don't show Folder arrow for folders without visible children.
2014-05-21 12:11:34 +03:00
23acc30e27
DD-102 : Fix crash when emptying trash containing nested folders. Also avoid getting listings several times
2014-05-16 17:12:22 -07: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
Ansariel