livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,989 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

223 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
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 17e3b2936a GH-68175 [SL-17986] Ability to drag Favorites to the Overflow menu 2024-02-06 02:59:32 +03:00
Ansariel 242c8cb5ed Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/CMakeLists.txt
#	indra/llprimitive/llmodel.cpp
#	indra/llwindow/CMakeLists.txt
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lllegacyatmospherics.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvopartgroup.cpp
#	indra/newview/llworld.cpp
 2022-10-25 11:49:36 +02:00
Callum Linden 80585d56fd Merge master into DRTVWR-568 (and fix conflicts) 2022-10-24 17:48:16 -07:00
Ansariel 0e325eab28 Merge branch 'DRTVWR-568' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/CMakeLists.txt
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/Python.cmake
#	indra/llcommon/llsd.h
#	indra/llcommon/llstl.h
#	indra/llinventory/llparcel.cpp
#	indra/llmessage/llmessagethrottle.cpp
#	indra/llui/lldockablefloater.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloater360capture.cpp
#	indra/newview/llfloaterregioninfo.cpp
#	indra/newview/llwatchdog.cpp
#	indra/newview/viewer_manifest.py
 2022-09-17 14:37:33 +02:00
Ansariel 55f51f4829 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-31 17:02:33 +02:00
Nat Goodspeed 2dc4aec993 DRTVWR-568: Eliminate more blockers to C++17 language standard. 2022-08-26 17:21:01 -04:00
Ansariel 4d5b5a5ae3 Enable c++17 since it seems LL is hesitant to finally do it... 2022-08-11 21:56:48 +02:00
Ansariel 1e50da6b7a Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer 2022-07-27 02:06:54 +02:00
Andrey Kleshchev bb318110ef SL-17818 Crash at childrenHandleDragAndDrop 2022-07-22 10:56:37 +03:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
 2022-04-19 13:21:52 +02:00
Mnikolenko Productengine e2aa8e17e2 SL-17039 "Remember Password" checkbox state should be saved per account name 2022-03-28 17:41:48 +03:00
Ansariel e10dea5fe2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 18:09:12 +01:00
Andrey Lihatskiy 201f83472c Merge branch 'master' into DRTVWR-543-maint 2022-02-28 21:55:28 +02:00
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01:00
Andrey Lihatskiy 9a1af101cd Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp
 2021-11-19 04:38:19 +02:00
Ansariel f00647b6fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 15:38:25 +01:00
Andrey Lihatskiy f9373a9b4e Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp
 2021-11-16 00:54:53 +02:00
Ansariel 160f44375e Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer 2021-10-12 12:59:35 +02:00
Andrey Lihatskiy adcd08fbf4 Revert "Merge branch 'c++17' into DRTVWR-522-maint" 
This reverts commit 203ea3a70a, reversing
changes made to 8e3f077886.

# Conflicts:
#	indra/newview/llmachineid.cpp
 2021-09-28 19:22:18 +03:00
Mnikolenko Productengine f3a43c74f9 SL-16063 FIXED The favorite landmark does not change after editing from another machine 2021-09-24 15:28:25 +03:00
Ansariel 7a845ee23b Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-522 2021-09-20 12:59:14 +02:00
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
 2021-09-03 00:18:26 +03:00
Ansariel f2cd97a055 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-31 14:49:52 +02:00
Nat Goodspeed 2e790e9b72 DRTVWR-538: Merge branch 'master' into c++17 2021-06-29 10:48:02 -04:00
Ansariel 44d78f3dbe Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-27 16:18:42 +02:00
Ansariel e893536a3a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 16:02:59 +02:00
Andrey Lihatskiy 0ca16a1f95 Merge branch 'master' into DRTVWR-527-maint 
# Conflicts:
#	indra/newview/llinventorypanel.cpp
 2021-06-25 01:02:04 +03:00
Andrey Lihatskiy 293272c2c7 Merge branch 'master' into DRTVWR-521-maint 2021-06-25 00:52:03 +03:00
Nat Goodspeed 26fb5d7af7 SL-15241: Tweak viewer sources to permit compiling on Mac with C++17. 2021-05-07 20:32:04 -04:00
Ansariel 83f1830576 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 14:27:34 +02:00
Ansariel 9768f25de0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-05-02 02:08:40 +02:00
Ansariel 8afe22531d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-04-30 23:42:57 +02:00
Andrey Lihatskiy 0fa5fc47a2 Merge branch 'master' into DRTVWR-527-maint 2021-04-30 03:04:47 +03:00
Andrey Lihatskiy e5a428f362 Merge branch 'master' into DRTVWR-521-maint 2021-04-30 03:00:32 +03:00
Andrey Lihatskiy c54382b760 Merge branch 'master' into DRTVWR-518-ui 
# Conflicts:
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 2021-04-29 20:04:33 +03:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Ansariel f206994f46 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-31 14:40:20 +02:00
Mnikolenko Productengine 89b4611fc0 SL-15036 Add actions to move landmarks between tabs in the Places floater 2021-03-30 15:53:22 +03:00
Ansariel 390beef53f Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-19 16:23:53 +01:00
Mnikolenko Productengine 38db12920c SL-14901 adjusted 'More' button 2021-03-18 20:18:23 +02:00
Mnikolenko Productengine 446253df44 SL-14901 Updated button according to new spec 2021-03-10 17:54:44 +02:00
Ansariel d36f1c75ad Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-03-03 15:08:10 +01:00
Mnikolenko Productengine c1139ed9b5 SL-14901 Add a button on the Landmarks bar to open the Places floater 2021-02-25 20:35:07 +02:00
Mnikolenko Productengine 806345951b Revert "SL-14901 Add a button on the Landmarks bar to open the Places floater" 
This reverts commit 2d4a894b70.
 2021-02-25 20:25:56 +02:00
Mnikolenko Productengine 2d4a894b70 SL-14901 Add a button on the Landmarks bar to open the Places floater 2021-02-25 16:55:11 +02:00
Ansariel 91346628f6 Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-02-19 09:02:07 +01:00
Andrey Kleshchev 53343bc708 SL-14797 Normalize right-click - favorites panel, part #4 2021-02-19 00:05:51 +02:00
Brad Payne (Vir Linden) d9ba2a8100 SL-14570 - error messages, avoid a couple of warnings caused by attempts to create folders before inventory is loaded 2020-12-18 20:45:04 +00:00
Ansariel 22b2d0d4e0 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-04 15:33:34 +01:00