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
|
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 |
|
Andrey Lihatskiy
|
85f2447b3d
|
Merge branch 'main' into marchcat/a-merge
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
|
2024-04-24 19:28:15 +03:00 |
|
Ansariel
|
d0102af56d
|
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
|
2024-04-11 21:59:38 +02:00 |
|
Andrey Lihatskiy
|
84dfe55810
|
Merge branch 'main' into marchcat/y-merge
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
|
2024-04-10 07:08:25 +03:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
c285f59ce2
|
Replace BOOL with bool in llwindow and dependent classes
|
2024-02-18 15:51:54 +02:00 |
|
Alexander Gavriliuk
|
5bd9c86314
|
#746 BugSplat Crash: LLAccordionCtrlTab::showAndFocusHeader(873)
|
2024-02-09 00:36:54 +03:00 |
|
Andrey Lihatskiy
|
e3e1672ac4
|
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
# Conflicts:
# indra/newview/llchiclet.h
|
2024-02-05 22:04:40 +02:00 |
|
Ansariel
|
ba74152c82
|
Replace BOOST_FOREACH with standard C++ range-based for-loops
|
2024-01-09 20:44:50 +02:00 |
|
Maxim Nikolenko
|
a169576082
|
SL-20468 Add ability to overwrite an existing outfit
|
2023-10-24 19:31:20 +03:00 |
|
Alexander Gavriliuk
|
45a1a94a35
|
SL-20432 Filtering My Outfits with big number of items freezes UI
|
2023-10-11 08:40:50 +02:00 |
|
Andrey Kleshchev
|
cd0c40c71a
|
SL-19904 Outfit gallery keyboard support
|
2023-06-27 00:29:34 +03:00 |
|
Maxim Nikolenko
|
81d69cf84d
|
SL-19379 WIP add worn suffix, use bold font style for worn items and italic for links
|
2023-03-31 13:40:59 +03:00 |
|
Andrey Kleshchev
|
24f8f47d46
|
SL-19188 Fix thumbnail changes being ignored by outfit gallery
|
2023-03-21 23:59:03 +02:00 |
|
Andrey Kleshchev
|
cf901b5abb
|
SL-19282 Thumbnail adjustments
Follow links, fix outfts missing 'image' option, adjust inspector, recolor 'worn' in gallery
|
2023-03-02 01:46:46 +02:00 |
|
Andrey Kleshchev
|
4eee501517
|
SL-19108 Cleanup Outfit Galery #2
|
2023-02-22 01:44:41 +02:00 |
|
Andrey Kleshchev
|
682c9aa3c2
|
SL-19108 Cleanup Outfit Galery
Is supposed to use thumbnails now
|
2023-02-21 23:56:47 +02:00 |
|
Andrey Kleshchev
|
2d68a7c336
|
SL-19108 Update Simple snapshot floater
|
2023-02-21 23:04:36 +02:00 |
|
Andrey Kleshchev
|
6786e43fcb
|
SL-19108 Managing inventory thumbnail
|
2023-02-21 00:25:47 +02:00 |
|
Andrey Kleshchev
|
6a260bb3f0
|
SL-19108 Rename outfit snapshot floater
|
2023-02-21 00:24:23 +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 |
|
Andrey Lihatskiy
|
91f9f2e9f7
|
DRTVWR-570 Mac build fix: unused variables cleanup
|
2022-10-27 23:08:09 +03:00 |
|
Andrey Lihatskiy
|
55da4ea8bb
|
Merge branch 'master' into DRTVWR-565-maint-P
# Conflicts:
# indra/newview/llfloateroutfitsnapshot.cpp
|
2022-08-31 00:36:22 +03:00 |
|
Mnikolenko Productengine
|
fcb3b6917c
|
SL-17670 Simplify outfit snapshot floater
|
2022-07-19 18:56:59 +03:00 |
|
Andrey Kleshchev
|
ababcc700c
|
SL-17532 Ability to pick inventory image as a profile image
|
2022-06-09 00:22:02 +03:00 |
|
Andrey Lihatskiy
|
edb6293528
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-12-15 21:50:40 +02:00 |
|
Andrey Lihatskiy
|
0bffd3d365
|
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
|
2021-11-16 01:21:05 +02:00 |
|
Andrey Lihatskiy
|
30c381406c
|
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# doc/contributions.txt
|
2021-11-16 01:09:11 +02:00 |
|
Andrey Lihatskiy
|
6c8e6f033b
|
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
|
2021-07-20 02:48:05 +03:00 |
|
Callum Prentice
|
8631a7a077
|
Merge with tip of Master after a Viewer release
|
2021-07-19 14:35:44 -07:00 |
|
Andrey Lihatskiy
|
3a476a8296
|
Merge branch 'master' into DRTVWR-530-maint
|
2021-07-19 22:22:42 +03:00 |
|
Andrey Kleshchev
|
823f97ac59
|
SL-15272 Bugsplat crashes at condition wait()
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
|
2021-06-03 21:31:30 +03:00 |
|
Andrey Kleshchev
|
777f3f48d0
|
SL-15291 Outfit Gallery shows 3 items per row when only 2 can fit
|
2021-06-01 23:11:27 +03:00 |
|
Andrey Kleshchev
|
96cbe52803
|
SL-15272 Bugsplat crashes at condition wait()
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
|
2021-05-21 20:52:08 +03:00 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
2021-03-09 14:39:51 -08:00 |
|
Andrey Lihatskiy
|
8d5f5b4ced
|
Merge branch 'master' into DRTVWR-521-maint
|
2021-03-09 22:00:01 +02:00 |
|
Andrey Lihatskiy
|
ec824a16d5
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-03-09 21:57:53 +02:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Andrey Lihatskiy
|
9ba43b5ce9
|
Merge branch 'master' into DRTVWR-521-maint
|
2021-03-02 21:42:32 +02:00 |
|
Andrey Lihatskiy
|
135d54a4ff
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-03-02 21:41:37 +02:00 |
|
Andrey Kleshchev
|
46ebe69f32
|
SL-14303 Fix LLWearableType to not spam in logs
|
2020-11-10 18:18:51 +02:00 |
|
Andrey Lihatskiy
|
83822fd199
|
Merge branch 'master' into DRTVWR-516-maint
# Conflicts:
# indra/newview/llvocache.cpp
|
2020-09-28 22:39:06 +03:00 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Andrey Kleshchev
|
94ebf52edd
|
SL-12435 Crash on mRowPanels.back()
|
2020-09-24 20:56:23 +03:00 |
|
Callum Prentice
|
38faec3b11
|
Merge branch 'master' into DRTVWR-519
|
2020-09-22 13:07:39 -07:00 |
|
Callum Prentice
|
2e6f516411
|
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
|
2020-09-16 21:12:53 -07:00 |
|
Mnikolenko Productengine
|
5cceddbc35
|
SL-13930 Appearance sort order should be similar to Inventory sort order
|
2020-09-14 12:13:33 +03:00 |