67081f9728
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
47964fb28d
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-20 16:47:38 +02:00
589a167147
Fix leak of LLFolderViewModel sorter and filter with unique_ptr
2022-10-19 22:19:22 -04:00
835d454a52
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llviewerparcelmgr.cpp
2022-07-15 13:12:50 +02:00
e72c803df0
SL-17741 Paste is not disabled when copying 'no copy' items
...
We should allow to copy 'no copy' items for the ability to paste them as links, but regular 'paste' should be disabled in such case
Also fixed library items enabling 'paste as link', we can not link library items.
2022-07-09 17:10:13 +03:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00:00
7458601374
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-02 00:05:53 +01:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
b61a998574
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2021-01-17 19:29:33 +01:00
db161b6f85
SL-14074 Resolved potential cause of conversation crashes
...
Models (listeners) belong to folder-views, deleting all of them means that not only proper cleanup procedure won't be followed, and view might try clean dead pointer.
2021-01-05 18:20:47 +02:00
0ba281e843
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-12-08 09:41:10 +01:00
7ab3de94cd
Revert "SL-14270 Crash accessing deleted 'parent' via callback from child"
...
There are random inventory's buildViewsTree crashes in branch with SL-14270 commit and there doesn't seem to be anything else inventory related that could have caused those. Reverting commits to see if it fixes crashes.
2020-12-07 19:34:36 +02:00
a0be0371d7
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 01:12:13 +01:00
e1ae2e7cbd
Mac buildfix
2020-11-12 00:06:39 +02:00
dc136e8dc8
SL-14270 A bit of cleanup #2
2020-11-05 22:54:28 +02:00
d17af5f3a6
SL-14270 A bit of cleanup #1
2020-11-05 22:02:26 +02:00
281c3d8bee
SL-14270 Crash accessing deleted 'parent' via callback from child
2020-11-05 22:02:21 +02:00
0007ff2660
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-07 12:29:58 +02:00
1062164cfe
SL-13119 Duplicate check was causing slowdowns
2020-04-28 18:13:14 +03:00
22ac7edd6e
FIRE-20414 / FIRE-29342: Add option to protect folders from getting moved or deleted
2020-04-14 17:03:26 +02:00
6a0cf31d10
Manual merge of SL-717 with Zi's extended inventory search so we can simply discard LL's upcoming commit without screwing things up
2017-08-05 14:04:10 +02:00
ea152d0d0b
SL-717 Additional search options for inventory window
2017-08-04 18:44:38 +03:00
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
7d54c62016
MAINT-6397 cut items should not go to trash
2016-05-25 20:37:52 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
ebf54d4b2d
Merge with Viewer-VMM
2015-07-15 14:23:19 +02:00
25e15f6730
For each inventory item inserted there was a linear search over all sibling items (in the folder), replace this with a much simpler parent lookup.
2015-05-01 14:59:41 +02:00
2e62e7576e
MAINT-5274 Missing folder arrow
2015-06-22 19:26:28 +03:00
b0f590f6ab
Pull merge from lindenlab/viewer-release
2014-12-19 06:00:48 -08:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
32282f8d9e
MAINT-4422 FIXED Inventory re-sorts itself if any of the Filters are enabled and you detach an item from your Avatar
2014-09-08 10:56:31 +03:00
a14ba78dbb
MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder
2014-08-12 19:45:53 +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
86d75052f6
DD-84 : Fix all active listing modification actions. Add specific message when listing will unlist. Make update skip consistency check when called from internal level (not public API).
2014-06-03 19:46:33 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
dc353c205a
Merge
2014-06-10 20:27:31 -07:00
3b0cf7ef78
Fix merge error and derive LLFolderViewModelItem from FSFolderViewModelItem again.
2014-06-10 21:50:47 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
813bc232e7
MAINT-3017 FIX Inventory filter for Recent tab does not persist between sessions as it used to.
...
added names back to inventory filters, so they can be deserialized
2013-12-09 15:42:51 -08: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
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
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
2cc1fb250f
CHUI-849 : Use a time limit for filtering instead of number limit, use a different limit for visible and unvisible lists
2013-04-19 16:51:44 -07:00
03ad10d258
CHUI-849 : WIP : Filter limit on time instead of number of items
2013-04-18 19:46:08 -07:00
Ansariel