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

68389 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Cosmic Linden fcbd928679 SL-16918: Minimap navigation improvements: Drag without holding shift, remove auto center, click button to re-center 2022-03-03 17:12:50 -08:00
Andrey Kleshchev 7ee206b64f SL-16965 360 Snapshot tool fails to save file to computer 2022-03-03 22:42:40 +01:00
Andrey Kleshchev 57c4dee284 SL-16755 Show alert that download is not supported instead of failing silently 2022-03-03 22:42:40 +01:00
Ansariel 60314ad80e Revert "Fix broken 360 snapshot saves" 
This reverts commit 692f5d424e.
 2022-03-03 22:42:10 +01:00
Cosmic Linden 0e927e92f3 SL-16824: Fix minimap tooltip hint not updating until viewer restart (double click to show map vs double click to teleport) 2022-03-03 12:30:59 -08:00
Cosmic Linden 81da0dd2db SL-16824: Change minimap hover tooltip. Show parcel name, owner name, and/or for sale info when available. Remove "shift-drag to pan" hint. 2022-03-03 12:30:58 -08:00
PanteraPolnocy 1df9d1ec7f FIRE-31446 Updated Russian translation, by Romka Swallowtail 2022-03-03 21:23:40 +01:00
Mnikolenko Productengine 76a1b181e6 SL-16970 FIXED Crash in LLToolPie::teleportToClickedLocation 2022-03-03 16:40:00 +02:00
Howard Stearns 239a29ab5c SL-9748 - more cases 2022-03-02 17:39:12 -08:00
Andrey Kleshchev 8116078c72 SL-16965 360 Snapshot tool fails to save file to computer 2022-03-02 23:45:26 +02:00
Andrey Kleshchev 4632051619 SL-16755 Show alert that download is not supported instead of failing silently 2022-03-02 23:44:54 +02:00
Ansariel 6e91246709 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 21:12:26 +01:00
Ansariel 692f5d424e Fix broken 360 snapshot saves 2022-03-02 21:12:15 +01:00
PanteraPolnocy 7f90c30bd6 FIRE-31439 French translation update, by Laurent Bechir 2022-03-02 20:44:25 +01:00
Nicky 4525ae3901 Use add_compile_definitions with cmake 3.12.0 now being a thing of the present. 2022-03-02 15:55:35 +01:00
Nicky 7c955976e4 Merge branch 'master' of ssh://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 15:04:53 +01:00
Nicky 974c00f6de Add apr so's to be copyed into sharedlibs 2022-03-02 14:49:29 +01:00
Nicky 1a774cf71a Add pragma for GCC 2022-03-02 14:47:59 +01:00
Nicky 0dfe0f888e Add pragma for GCC 2022-03-02 14:46:06 +01:00
Nicky c5d16fe1e2 Add missing brace. 2022-03-02 14:45:53 +01:00
Andrey Lihatskiy eb38bd7837 DRTVWR-483 Post-merge fix - restored the lost code 2022-03-02 15:08:11 +02:00
Ansariel 4916d595d1 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 13:56:20 +01:00
Ansariel ba12815f7c Let's just use add_compile_definitions because... future and stuff... 2022-03-02 13:56:13 +01:00
Ansariel 12e30f58a4 Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer 2022-03-02 12:05:47 +01:00
Ansariel 7001a372bf Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-02 12:05:22 +01:00
Ansariel 45bcd4a178 Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-03-02 12:05:02 +01:00
Ansariel 455b750cde Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/llviewermenu.cpp
 2022-03-02 12:04:09 +01:00
Ansariel cc95d520b4 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llspatialpartition.h
#	indra/newview/llvovolume.cpp
 2022-03-02 10:31:44 +01:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-02 10:12:19 +01:00
Nicky Dasmijn 3e77876ac4 Merged in nd_cleanup_v2 (pull request #891) 
Remove all boost, fix calling functions on nullptrs, initialize vars

Approved-by: Maxim Nikolenko
Approved-by: Nat Linden
Approved-by: Andrey Lihatskiy
 2022-03-02 02:39:07 +00:00
Nicky a92923c800 Linux; Add build_data.json to symbols. Tweak symbol filenam to be closer to distribution tarball 2022-03-01 22:47:40 +01:00
Nicky de70b18dd1 Linux; Update slvoice, include 32 bit libs. 2022-03-01 22:44:44 +01:00
Andrey Kleshchev a09686bf54 SL-16953 Deprecated NoInventoryLibrary 
Due to changes in SL-16715
 2022-03-01 21:40:12 +02:00
Ansariel 4446933c54 Build fix 2022-03-01 20:33:53 +01:00
PanteraPolnocy 4fc084474f Updated Polish translation 2022-03-01 20:00:58 +01:00
Ansariel 3f141599f6 Update German translation 2022-03-01 19:43:35 +01:00
Ansariel 892500ee41 Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2022-03-01 19:34:34 +01:00
Ansariel d34e3a9ab4 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-03-01 19:31:32 +01:00
Ansariel 63238d1fbe Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/newview/llappviewer.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 19:19:48 +01:00
Ansariel a74de2d794 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 19:14:31 +01:00
Ansariel e10dea5fe2 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 18:09:12 +01:00
Nicky 617c01e26b Linux; remove setting of proxy info till dullahan gets an update. 2022-03-01 13:20:43 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
 2022-03-01 13:41:42 +02:00
Mnikolenko Productengine b4a5bf0e8c merge conflict fix 2022-03-01 13:40:03 +02:00
Ansariel 25f974d77d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 10:00:36 +01:00
Ansariel 9ee728f51d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 09:53:51 +01:00
Nicky 2dc899a698 Replace hg with git, as mercurial isn't used for ages anymore 2022-03-01 09:33:23 +01:00
Ansariel b325b0e08a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-03-01 08:38:39 +01:00
Ansariel c5e258f40f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 08:38:19 +01:00
Andrey Lihatskiy fa9d4927f4 Merge remote-tracking branch 'NickyD/viewer-cleanup:master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
 2022-03-01 02:59:15 +02:00