9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03:00
7ddbf118f5
SL-13182 Split buildNewViews over frames
2021-04-01 23:06:44 +03:00
65352e9884
SL-14927 Some avatar names not resolving in chat
2021-03-19 13:47:32 +02:00
5f6a025397
Revert "SL-14927 Some avatar names not resolving in chat"
...
This reverts commit a66932a091
2021-03-19 13:40:19 +02:00
a66932a091
SL-14927 Some avatar names not resolving in chat
...
buildConversationViewParticipant() was deparenting view models that belong to session
2021-03-19 13:22:05 +02:00
fb1238a1ce
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.cpp
# indra/newview/llenvironment.cpp
2020-11-13 18:26:56 +02:00
0b395f01f9
SL-13570 FIXED The name of the item is overlapped by search term in inventory
2020-09-30 14:25:21 +03:00
8576eaa3bf
SL-13119 Fixed label updates
2020-05-07 00:07:29 +03:00
59433e3132
SL-13119 Made control settings cached and fixed potential filtering issue
2020-04-30 16:32:16 +03:00
d70b749101
SL-13119 Moved ineffective function from inventory view creation
2020-04-29 21:55:40 +03:00
dc1453af9c
Merge in from viewer-release 6.3.5
2019-11-13 16:46:27 -07:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
c8d8414b3b
SL-10509 EEP Settings Picker gets closed by drag&drop
2019-02-08 19:06:20 +02:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +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
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
f94a19e09e
Merge downstream code and become version 3.8.3
2015-08-04 16:45:49 +03: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
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
9ba10bf1f2
Merge lindenlab/viewer-tools-update
2015-03-16 09:49:57 -07: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
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
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
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
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
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
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
Andrey Lihatskiy