Commit Graph

327 Commits (693e05ab85b3fcdc65bcb9f4123c2fae4ecc27fc)

Author SHA1 Message Date
Ansariel Hiller 9f7dd01772
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH (#2361) 2024-08-20 18:41:48 +03:00
Ansariel b42f9d836b Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +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 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 088f2f4f65 More BOOL to bool replacements primarily in llappearance and llxml 2024-02-17 20:45:34 +02:00
Lars Næsbye Christensen 9e854b697a misc: BOOL to bool 2024-02-17 12:23:07 +02:00
Lars Næsbye Christensen 2b31dad400 miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Andrey Kleshchev 3d73a10da3 Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
Andrey Kleshchev 0b16cd0da4 SL-19823 Edit not active for items 2023-06-07 00:13:59 +03:00
Andrey Kleshchev 171b8dbeb3 SL-19583 Fix rename's width and update frequency
This way of calculating scroll turns out to be one large hack.
Probably needs a proper combination view instead of combining two
different views that have own scrolls or those views need to support
not having personal scroll.
2023-05-03 00:42:51 +03:00
Henri Beauchamp bf7faa3267 Faster and simpler inventory category hashing.
This commit changes inventory category hashing from slow LLMD5 to fast HBXX128 hashing, and allows to use a simple LLUUID for the hash, instead of an LLMD5 instance.
It also removes some old cruft dealing with unused baked texture hashing.
2023-02-06 11:30:23 +01:00
Andrey Lihatskiy c9343c4004 DRTVWR-543 Post-merge build fix 2021-11-19 06:05:45 +02:00
Andrey Lihatskiy 9a1af101cd Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp
2021-11-19 04:38:19 +02:00
Andrey Kleshchev 9aa5be79d9 SL-4250 Do not allow editing worn items if items or avatar are not yet loaded 2021-09-07 23:47:16 +03:00
Andrey Kleshchev 92af5af736 Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maint
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
2020-11-11 23:34:37 +02:00
Andrey Kleshchev 46ebe69f32 SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
Mnikolenko Productengine 5a44656a26 SL-13337 Remove teen account limitations concerning undergarments 2020-05-28 16:19:53 +03:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
andreykproductengine 6ec37fac60 SL-12196 Crash at updateMeshTextures 2019-10-29 22:37:02 +02:00
Graham Linden 723f1891db Merge 6.3.1 viewer-release 2019-08-26 12:35:18 -07:00
Anchor Linden 7318bd61f7 [MAINT-8873] - check for bakesOnMesh enabled sim feature, before creating universal wearable type 2018-07-19 22:46:03 +05:30
Rider Linden b766466b30 Added settings inventory object with subtype 2018-02-26 09:27:14 -08:00
Mnikolenko Productengine f0ab36aec5 build fix 2016-07-26 16:12:53 +03:00
Mnikolenko Productengine c8d682484c MAINT-6566 Avatar sliders display incorrect values immediately after saving a copy of the wearable. 2016-07-26 11:31:37 +03:00
Mnikolenko Productengine 799f21616c MAINT-6520 Add a way to see worn temp attachments. 2016-07-18 11:26:39 +03:00
andreykproductengine 0070a5f964 MAINT-6490 Newly created inventory reports version mismatch 2016-06-17 19:04:10 +03:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine 017a564999 MAINT-5742 FIXED Appearance window progress indicator spins after changing to an identical outfit 2015-10-19 17:04:38 +03:00
Mnikolenko ProductEngine 8b5c8c7f5b MAINT-5742 FIXED Appearance window progress indicator spins after changing to an identical outfit 2015-10-19 12:46:59 +03:00
andreykproductengine e03c133750 Merge from viewer-relese and become version 3.8.2 2015-07-15 14:59:32 +03:00
andreykproductengine b59770199a Merge from viewer-release 2015-06-05 16:30:04 +03:00
Brad Payne (Vir Linden) 9e3eb8991d merge 2015-05-27 11:08:45 -04:00
Brad Payne (Vir Linden) 6fc663d62a DRTVWR-397 WIP - logging for detach requests and unexpected detaches (presumably server-initiated) 2015-03-20 11:03:47 -04:00
Brad Payne (Vir Linden) 8963185f5b MAINT-4917 WIP - comments and bug fixes for batching up COF link requests after attachments added. 2015-03-19 17:05:55 -04:00
Brad Payne (Vir Linden) 090d3097d5 MAINT-4917 WIP - Attachment deferred bulk COF linking WIP 2015-03-18 21:41:47 -04:00
andreykproductengine 3805808caf MAINT-4872 FIXED Display name for shapes was not updated in certain cases 2015-03-18 19:24:58 +02:00
Brad Payne (Vir Linden) 6aa63dce33 SL-103 WIP - viewer enforces wearable limits based on total articles of clothing rather than per-type limit. Limit is artificially low for testing, will bump before release. 2015-03-05 16:17:45 -05:00
andreykproductengine 2ea45ee2c9 MAINT-4872 FIXED wearables with same asset id are not swapped 2015-02-24 19:35:53 +02:00
Brad Payne (Vir Linden) 7b99314d84 MAINT-4653, DRTVWR-397 WIP - more code for tracking attachment operations, smarter handling of multiple requests. 2015-02-20 15:54:27 -05:00
Brad Payne (Vir Linden) 1f2404aa29 Logging for attachments and their COF links 2015-02-18 16:44:36 -05:00
Brad Payne (Vir Linden) 7b6131fbf9 MAINT-4537 WIP - comments and cleanup 2014-11-15 14:36:30 -05:00
Brad Payne (Vir Linden) b1884d40f5 MAINT-4537 WIP - more joint position management during outfit changes 2014-11-15 14:29:39 -05:00
Brad Payne (Vir Linden) 9c4397b6ee MAINT-4537 WIP - joint position management during outfit changes 2014-11-14 15:41:03 -05:00
Brad Payne (Vir Linden) 30c1d67d95 MAINT-4537 WIP - order of operations during outfit change 2014-11-14 09:25:43 -05:00
Brad Payne (Vir Linden) 79bb641310 MAINT-4158 WIP - fix for bug caused by multiple wearables with the same asset id 2014-08-21 14:18:35 -04:00
Mnikolenko ProductEngine 6b5375ba14 MAINT-4237 FIXED Update mCOFChangeInProgress when only gestures or objects (not weareables) are added to outfit. 2014-07-16 13:28:57 +03:00
Oz Linden e15002a11c merge changes for 3.7.9-release 2014-06-16 11:42:37 -04:00
Brad Payne (Vir Linden) f2d7dfb1e6 merge fixes 2014-05-16 10:18:53 -04:00