Megapahit's fork of the Second Life viewer. https://megapahit.org/viewer.git/atom?h=26.1.1 2025-08-20T22:04:55Z 2025-08-20T22:04:55Z Rye rye@alchemyviewer.org 2025-08-20T22:04:55Z urn:sha1:ba30737d8f4add8ddd8c77d18df6497b46583fe9 2025-04-18T20:15:47Z Ansariel Hiller Ansariel@users.noreply.github.com 2025-04-18T20:15:47Z urn:sha1:74a71e30e76862d59a240a1592c4094ff82f3bf6 2025-04-17T20:57:00Z Andrey Lihatskiy alihatskiy@productengine.com 2025-04-17T20:57:00Z urn:sha1:082c9158b2ad961b747ca6a7bd55bc2a79f27b6a # Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h 2025-04-17T17:50:30Z Ansariel ansariel.hiller@phoenixviewer.com 2025-04-17T17:50:30Z urn:sha1:4c6afbbb75076e9fd34ee5707a02195c4e2f7223 * Make eligible functions constexpr * Use constants for vector indices where applicable * Reformat to match actual coding conventions 2025-04-10T20:51:36Z Ansariel ansariel.hiller@phoenixviewer.com 2024-10-15T20:35:38Z urn:sha1:19347f7094c9448e02a021ae2d571b5fe8bfcc2e * Restore changes from 21947778baaca205615a71a97ac8f563c998fdd3 to llwindow/llwindowwin32.cpp * Restore changes from 3758618949684641fc94b5c9478d9002706213cc to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa1a8bf43a8980217ce34e3b5f4458483e0 in newview/llpaneloutfitsinventory.h * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f0fda4d2363d351fa550b4f8818b46c2c3 in newview/llviewertexture.cpp * Restore changes from b9633c17e373bfe55b29228996e8473eb041466d & 98f7d73d46fdc045759023eda6409e8c791f5cb2 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 23729442aab7130f3368d433e8a5a9dd45ff6b98 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp 2025-04-10T03:01:50Z Andrey Lihatskiy alihatskiy@productengine.com 2025-04-10T03:01:50Z urn:sha1:5d7a5001b41df8989cd493433c3dc45459db8240 # Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp 2025-02-11T10:04:05Z Rye rye@lindenlab.com 2025-02-02T08:40:21Z urn:sha1:39a13e4088db6e4023d196de07765363ddce2c4f 2025-01-23T23:40:19Z Rye rye@lindenlab.com 2025-01-23T23:40:19Z urn:sha1:4763195e186f8c56c2ee92d4e0154c95aa011997 2024-06-14T22:18:49Z Alexander Gavriliuk alexandrgproductengine@lindenlab.com 2024-06-14T06:06:31Z urn:sha1:3d84a147f0ae781a71f74d9d7ad0b07f9b1ccb43 2024-05-22T19:40:26Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T19:25:21Z urn:sha1:e2e37cced861b98de8c1a7c9c0d3a50d2d90e433