Ansariel
|
0a83a1e6b7
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# autobuild.xml
# indra/newview/llagentbenefits.cpp
# indra/newview/llagentbenefits.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llsnapshotlivepreview.cpp
|
2024-07-18 20:04:45 +02:00 |
|
Alexander Gavriliuk
|
ef9a494134
|
#1500 Better out of disk space handling
|
2024-07-18 09:42:59 +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 |
|
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 |
|
Ansariel
|
5f1a19af72
|
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
|
2024-05-01 12:30:57 +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
|
7a2070d795
|
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
|
2024-04-24 18:59:46 +02:00 |
|
Ansariel
|
840c87164a
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# README.md
# indra/llcrashlogger/llcrashlogger.cpp
|
2024-02-09 01:12:52 +01:00 |
|
Lars Næsbye Christensen
|
ba4e7b989b
|
llcommon: BOOL (int) to real bool/LSTATUS
|
2024-02-09 01:02:29 +02:00 |
|
Ansariel
|
a831237e29
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llimage/llimage.h
# indra/llkdu/llimagej2ckdu.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# scripts/messages/message_template.msg.sha1
|
2024-02-06 17:58:20 +01:00 |
|
Alexander Gavriliuk
|
74c8b028d4
|
SL-20743 Use LLMutex in LLImageBase for internal data thread-safety
|
2023-12-21 19:12:52 +01:00 |
|
Ansariel
|
50c7296d34
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llvoavatar.cpp
|
2023-12-01 11:27:42 +01:00 |
|
Andrey Lihatskiy
|
0465c761a4
|
Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_performance_preferences.xml
|
2023-11-30 12:28:26 +02:00 |
|
Andrey Lihatskiy
|
d1c0a5b840
|
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
|
2023-11-29 10:45:43 +02:00 |
|
Ansariel
|
9eb885fd89
|
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/skins/default/xui/de/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/es/panel_main_inventory.xml
# indra/newview/skins/default/xui/fr/panel_main_inventory.xml
# indra/newview/skins/default/xui/it/panel_main_inventory.xml
# indra/newview/skins/default/xui/ja/panel_main_inventory.xml
# indra/newview/skins/default/xui/pl/panel_main_inventory.xml
# indra/newview/skins/default/xui/ru/panel_main_inventory.xml
|
2023-10-04 12:45:40 +02:00 |
|
Andrey Kleshchev
|
af9fe17089
|
SL-17135 Apr process creation crash
looks like pool regularly gets corrupted, try using separate pool
|
2023-10-03 21:14:34 +03:00 |
|
Andrey Kleshchev
|
37246b99f6
|
SL-17135 Apr process creation crash
looks like pool regularly gets corrupted, try using separate pool
|
2023-09-15 20:33:55 +03:00 |
|
Ansariel
|
f7063cecdd
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llappviewer.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
|
2022-12-14 10:13:07 +01:00 |
|
Brad Linden
|
eb526fec0a
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2022-12-12 17:59:34 -08:00 |
|
Ansariel
|
9c4c27a56f
|
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
|
2022-08-01 22:07:39 +02:00 |
|
Andrey Kleshchev
|
fe26a9d32c
|
SL-17868 Crash at ThreadRecorder::bringUpToDate
According to bugsplat get_thread_recorder was null
Replaced apr based LLThreadLocalPointer with thread_local
|
2022-07-30 02:57:30 +03:00 |
|
Ansariel
|
c5d9c3c2a7
|
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/cmake/Tracy.cmake
# indra/llcommon/llprofiler.h
# indra/llcommon/llqueuedthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llimagej2coj/llimagej2coj.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llrender/llimagegl.cpp
# indra/llrender/llimagegl.h
# indra/llwindow/llwindowwin32.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_mac.txt
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml
|
2022-06-03 15:07:06 +02:00 |
|
Dave Parks
|
b6841d75c2
|
SL-17219 WIP - Texture pipeline overhaul
|
2022-04-15 19:02:07 -05:00 |
|
Ansariel
|
87dacc1ec1
|
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-09-25 16:13:23 +02:00 |
|
Andrey Kleshchev
|
6a32a7551e
|
SL-13034 Last string in logs should say 'Goodbye'
These logs were not logging for very long due to supressed logging system, no point showing them now
|
2020-09-25 17:02:22 +03:00 |
|
Ansariel
|
b0b4f0e9c1
|
Merge viewer-neko
|
2019-12-01 13:55:07 +01:00 |
|
andreykproductengine
|
dcf8487e4c
|
SL-6621 Small rework, should also fix mNumTotalRef related asserts
|
2019-11-19 22:15:41 +02:00 |
|
Ansariel
|
536a3f6c8e
|
Merge viewer-neko
|
2019-01-18 23:41:21 +01:00 |
|
andreykproductengine
|
26fae750ba
|
SL-10291 Replace apr_mutex with standard C++11 functionality
|
2019-01-14 22:04:44 +02:00 |
|
Ansariel
|
92df9704a5
|
Set LLScopedLock::mLocked to false if it gets unlocked; Thanks to Henri Beauchamp for pointing at this
|
2018-07-30 22:33:51 +02:00 |
|
Nicky
|
7cc408a5cd
|
Merge.
|
2018-04-10 12:33:45 +02:00 |
|
Nicky
|
3ea9a01423
|
Change pointer to member where possible and do a bit of cleanup in lerror (move the mutexex in there and us the LLMutextTryLock rather than a custom class).
|
2018-04-06 09:49:32 +02:00 |
|
Nicky
|
ef20e3f523
|
Replace ARP Mutex and Condition with std::mutx and std::conditional_variable
|
2018-04-05 12:02:12 +02:00 |
|
Ansariel
|
1a788686ad
|
Merge Firestorm LGPL
|
2018-02-12 19:59:48 +01:00 |
|
Ansariel
|
ebb14abbd8
|
FIRE-13474: Fix Collada export to filenames containing brackets fail
|
2018-01-24 13:00:10 +01:00 |
|
Ansariel
|
915496bbea
|
Merge viewer-vivox
|
2017-03-21 22:14:02 +01:00 |
|
Oz Linden
|
fd2ccb1606
|
merge changes for 4.1.2-release
|
2016-11-16 09:52:59 -05:00 |
|
Oz Linden
|
9260fbe0bd
|
add location details to apr status logging
|
2016-07-21 15:38:55 -04:00 |
|
Ansariel
|
04039bd5df
|
Merge viewer-bear
|
2016-06-16 00:05:04 +02:00 |
|
Mnikolenko Productengine
|
0a7144c870
|
MAINT-5040 Warning "ll_apr_warn_status: APR: Connection refused" continually appears on Linux
|
2016-06-14 13:47:27 +03:00 |
|
Ansariel
|
3192fe832f
|
Merge viewer-quickgraphics
|
2016-03-08 01:41:31 +01:00 |
|
Nicky
|
fa96509726
|
Cleanup.
|
2016-01-27 10:02:48 +01:00 |
|
Nicky
|
f2d1ad0b3b
|
Remove ndfile, as the new apr can handle utf8 filenames on Windows.
|
2016-01-26 23:36:53 +01:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Tank_Master
|
6babf8abd2
|
Merge LL 3.7.7
|
2014-06-09 11:29:57 -07:00 |
|
Richard Linden
|
59628d6f85
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-10-01 14:28:39 -07:00 |
|
Richard Linden
|
e340009fc5
|
second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
|
2013-08-09 17:11:19 -07:00 |
|
Richard Linden
|
a2a6bf20d7
|
merge with release
|
2013-06-20 16:46:23 -07:00 |
|
Graham Linden
|
d75667560c
|
Silence spurious asserts when pool is cleared at exactly it's limit
|
2013-06-15 07:19:23 -07:00 |