Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +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
|
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 |
|
Andrey Kleshchev
|
a657b9b52d
|
jira-archive-internal#71115 Add Images to Objects in Bulk
SL-20725
|
2024-02-20 19:05:54 +02:00 |
|
Andrey Kleshchev
|
305fe845c6
|
SL-20779 More reliable decode and encode error logging (#615)
|
2024-01-09 23:16:57 +02:00 |
|
Andrey Kleshchev
|
cfb69846f1
|
SL-20261 Allow and resize existing textures as necessary for thumbnails
|
2023-09-10 21:49:00 +03:00 |
|
Andrey Kleshchev
|
4800e3e416
|
SL-20099 Thumbnail upload scale textures to be square
thumbnail copy&paste only allows square textures and wasn't allowing
none square ones despite those already being used as thumbnails
|
2023-08-18 14:12:49 +03:00 |
|
Andrey Kleshchev
|
02a3df31ce
|
SL-19108 Update thumbnail cap names
|
2023-03-16 00:04:36 +02:00 |
|
Andrey Kleshchev
|
dd656390c3
|
SL-19108 Only permit 64 to 256 px images for thumbnails
|
2023-02-25 23:08:38 +02:00 |
|
Andrey Kleshchev
|
4886682d04
|
SL-19108 Multi instance snapshot floater
|
2023-02-22 21:40:30 +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 |