Megapahit's fork of the Second Life viewer. https://megapahit.org/viewer.git/atom?h=26.1.1 2025-09-24T13:43:24Z 2025-09-24T13:43:24Z Andrey Kleshchev 117672381+akleshchev@users.noreply.github.com 2025-09-22T21:13:11Z urn:sha1:c2460e2dbd6dc3525703f5eb7312714716bb5bc8 2025-05-29T13:30:41Z Ansariel Hiller Ansariel@users.noreply.github.com 2025-05-29T13:30:41Z urn:sha1:6f9883429ccdfbf63738051e76331fd68b3e627f 2025-05-28T18:38:00Z Andrey Lihatskiy alihatskiy@productengine.com 2025-05-28T18:38:00Z urn:sha1:b08ba3fa7bc9e6309891e510fbfb5c4e2b5c922e # Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h 2025-05-22T16:53:37Z Jonathan "Geenz" Goodman geenz@geenzo.com 2025-05-22T16:53:37Z urn:sha1:b62e7f96c235dd5754e329fcf13c0eea2352bbb1 2025-05-22T12:14:41Z Jonathan "Geenz" Goodman geenz@geenzo.com 2025-05-22T12:14:41Z urn:sha1:25e68341272549905298cfd9ae122cb27ae72102 2025-05-13T21:02:16Z Andrey Kleshchev andreykproductengine@lindenlab.com 2025-05-13T18:39:10Z urn:sha1:888d4ae9dfaf7ba3866c668fbac92502ce252f3b 2025-04-16T11:30:35Z Andrey Lihatskiy alihatskiy@productengine.com 2025-04-16T11:30:35Z urn:sha1:d464901e47ab0d55597a6a5b3b65a18492ef8004 2025-04-10T21:32:51Z Maxim Nikolenko maximnproductengine@lindenlab.com 2025-01-13T12:15:46Z urn:sha1:0c9f6f50efbde1d489979d1d7348bd480bb46cb2 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