Commit Graph

60 Commits (afdcd356db0a496e8916645eeebc8a03755ee0bd)

Author SHA1 Message Date
Alexander Gavriliuk 2b7b81fbdb #459 Filters on object inventory 2024-09-08 00:11:56 +02:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Lars Næsbye Christensen 2b31dad400 miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Andrey Kleshchev a62f5bfac1 SL-20232 Allow deletion of worn items #1 2023-10-17 21:26:39 +03:00
Maxim Nikolenko 5809238226 SL-19273 Show empty folder message for empty folders regardless of filter state 2023-04-04 16:38:53 +03:00
Maxim Nikolenko f377e27f0b SL-19274 Add new double-click option to Inventory settings 2023-02-27 20:27:11 +02:00
Maxim Nikolenko 49da5288bd SL-19234 add Inventory settings floater 2023-02-24 03:17:53 +02:00
Maxim Nikolenko 734b1b5d42 SL-19105 WIP Single-folder inventory view 2023-02-17 16:23:44 +02:00
Andrey Lihatskiy f836194516 Merge branch 'main' into DRTVWR-570-maint-Q
# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
Rye Mutt 589a167147 Fix leak of LLFolderViewModel sorter and filter with unique_ptr 2022-10-19 22:19:22 -04:00
Andrey Kleshchev 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
Dave Parks 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
Andrey Kleshchev 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
Andrey Kleshchev 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
Andrey Kleshchev 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
Andrey Lihatskiy e1ae2e7cbd Mac buildfix 2020-11-12 00:06:39 +02:00
Andrey Kleshchev dc136e8dc8 SL-14270 A bit of cleanup #2 2020-11-05 22:54:28 +02:00
Andrey Kleshchev d17af5f3a6 SL-14270 A bit of cleanup #1 2020-11-05 22:02:26 +02:00
Andrey Kleshchev 281c3d8bee SL-14270 Crash accessing deleted 'parent' via callback from child 2020-11-05 22:02:21 +02:00
Andrey Kleshchev 1062164cfe SL-13119 Duplicate check was causing slowdowns 2020-04-28 18:13:14 +03:00
Mnikolenko Productengine ea152d0d0b SL-717 Additional search options for inventory window 2017-08-04 18:44:38 +03:00
andreykproductengine 7d54c62016 MAINT-6397 cut items should not go to trash 2016-05-25 20:37:52 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
andreykproductengine f94a19e09e Merge downstream code and become version 3.8.3 2015-08-04 16:45:49 +03:00
andreykproductengine 7cd62f4908 MAINT-5274 Missing folder arrow 2015-06-22 19:26:28 +03:00
Merov Linden b0f590f6ab Pull merge from lindenlab/viewer-release 2014-12-19 06:00:48 -08:00
Mnikolenko ProductEngine 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
andreykproductengine a14ba78dbb MAINT-4218 FIXED Adding clothing from inventory closes THAT clothing folder and hides THAT folder 2014-08-12 19:45:53 +03:00
Merov Linden 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
Merov Linden 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
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Richard Linden 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
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 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
Merov Linden 2113bb8159 Pull merge from viewer-release 2013-05-22 11:23:51 -07:00
Merov Linden 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
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
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden 4ef1181cdc CHUI-659 : Fixed : Reimplemented open selection on hitting return the right way 2013-01-08 21:46:00 -08:00
Merov Linden 3d0ec3da5b CHUI-659 : WIP : Verified (tested) and cleaned up some CHUI-101 refactoring code. 2013-01-07 15:32:47 -08:00
Merov Linden f9b1b44071 CHUI-463 : Fixed. Allowed a model to be shared by several views. 2012-10-30 18:27:56 -07:00
Merov Linden d49de3a66a CHUI-441 : WIP : Fix crashes when spawning torn off floaters, added widgets creation in the torn off floater for participants. 2012-10-25 18:16:56 -07:00
Merov Linden 5b0e06108b CHUI-340 : Fix dupe items in the conversation model list. Refresh when resorting. 2012-09-24 19:55:31 -07:00
Merov Linden b5583906d0 CHUI-340 : WIP : Fix sorting bugs on time for sessions, simplified the update time mechanism and clean up 2012-09-21 18:12:06 -07:00
Merov Linden ab37263a5c CHUI-285 : LLIMFloaterContainer is now using LLParticipantList fully 2012-08-30 21:34:48 -07:00