Megapahit's fork of the Second Life viewer. https://megapahit.org/viewer.git/atom?h=26.1.1 2024-05-22T19:40:26Z 2024-05-22T19:40:26Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T19:25:21Z urn:sha1:e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 2024-05-22T17:04:52Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T17:04:52Z urn:sha1:1b67dd855c41f5a0cda7ec2a68d98071986ca703 # 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-04-29T04:56:09Z Andrey Lihatskiy alihatskiy@productengine.com 2024-04-29T04:43:28Z urn:sha1:1b68f71348ecf3983b76b40d7940da8377f049b7 2024-02-18T20:04:44Z Lars Næsbye Christensen lars@naesbye.dk 2024-02-18T15:41:22Z urn:sha1:f1c97f4057833220a2e9ac045d701208e30457d1 2024-02-17T10:23:07Z Lars Næsbye Christensen lars@naesbye.dk 2024-02-16T18:29:51Z urn:sha1:9e854b697a06abed2a0917fb6120445f176764f0 2015-11-10T14:48:56Z Oz Linden oz@lindenlab.com 2015-11-10T14:48:56Z urn:sha1:c8726aba303bcf1207b730a344536e25491420bc 2013-03-29T14:50:08Z Graham Madarasz graham@lindenlab.com 2013-03-29T14:50:08Z urn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0 2010-08-13T11:24:57Z Oz Linden oz@lindenlab.com 2010-08-13T11:24:57Z urn:sha1:06b0d72efa96b6a0ed665f7cd46f358c48929e7b 2009-05-04T17:43:26Z Adam Moss moss@lindenlab.com 2009-05-04T17:43:26Z urn:sha1:cc92525b0df952659102d2e5adcc4140fea7f371 svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql 2009-01-08T00:05:06Z Aaron Brashears aaronb@lindenlab.com 2009-01-08T00:05:06Z urn:sha1:e3cf284388e7c8a4c0755ba9e689f6a6264a5a26