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 |
|
Lars Næsbye Christensen
|
da967da9c7
|
Rename OS X to macOS, mostly in comments
We only support 10.13+ now, and it's been called macOS since 10.12. References in code to older versions are unchanged.
|
2024-01-11 19:11:33 +02:00 |
|
Ansariel
|
cb10f3b149
|
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
|
2022-11-11 12:15:54 +01:00 |
|
Rye Mutt
|
3dd874a99b
|
Fix memory leaks in lldir objc/mac
|
2022-10-28 18:47:32 -04:00 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
2021-03-09 14:39:51 -08:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Ansariel
|
6b6b116fd4
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2021-03-03 00:20:02 +01:00 |
|
Callum Prentice
|
d9448c6f52
|
The folder where the disk cache lives was originally renamed from llvfs to llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
|
2020-09-17 09:45:06 -07:00 |