Ansariel
|
85ae4ed95b
|
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llxml/llcontrol.cpp
# indra/llxml/llxmlnode.cpp
# indra/llxml/llxmltree.h
# indra/newview/CMakeLists.txt
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreastmotion.cpp
# indra/newview/llfloaterauction.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
|
2024-03-08 16:56:01 +01:00 |
|
Alexander Gavriliuk
|
a865d42397
|
viewer#819 Avoid reading the same XML file multiple times
|
2024-03-05 19:54:31 +01:00 |
|
Beq
|
c97777d106
|
don't warn when LL_PATH_NONE was deliberately selected
|
2022-02-12 20:26:22 +00:00 |
|
Andrey Lihatskiy
|
0bffd3d365
|
Merge branch 'master' into DRTVWR-519
# Conflicts:
# README.md
|
2021-11-16 01:21:05 +02:00 |
|
Ansariel
|
7a845ee23b
|
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522
|
2021-09-20 12:59:14 +02:00 |
|
Ansariel
|
f8d1834036
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-06-09 08:48:27 +02:00 |
|
Ansariel
|
826ee26272
|
Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-06-08 19:55:43 +02:00 |
|
Callum Prentice
|
ad9ed0a94d
|
Merge with tip of Master after Viewer release
|
2021-06-07 18:55:00 -07: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
|
3804ec1d03
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-04 08:35:13 +01:00 |
|
Ansariel
|
2ff2a32cfc
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-03-03 23:40:00 +01: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 |