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

60636 Commits (a879e86b8e3ecf4f5b319ba220a2ffba7b2ec681)

Author SHA1 Message Date
Ansariel a879e86b8e Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 21:53:26 +02:00
Ansariel 13086737cc Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501 2020-05-19 21:50:44 +02:00
Ansariel f2974e75a7 Fix merge issue 2020-05-19 21:48:01 +02:00
Ansariel 7425e189d3 Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 21:44:37 +02:00
Andrey Lihatskiy aaaf3189c4 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 2020-05-19 22:37:41 +03:00
Andrey Lihatskiy b86fdf1c31 SL-13273 Updated the SL logo images 2020-05-19 22:29:27 +03:00
Andrey Lihatskiy 8b8a57a977 SL-12896 BOM texture settings - replaced isRiggedMesh() call with faster check 2020-05-19 19:56:59 +03:00
Andrey Lihatskiy d9cdef171a SL-12904 Restored the missing code (post-merge) 2020-05-19 12:10:39 +03:00
Ansariel 6e988b3bad Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-19 10:44:44 +02:00
Ansariel 05ad4de150 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 
# Conflicts:
#	indra/llxml/llcontrolgroupreader.h
#	indra/newview/llviewerkeyboard.cpp
 2020-05-19 10:20:31 +02:00
Ansariel d204cf739f FIRE-29571: Turn "Sky" button into "Personal Lighting" button on navigation bar (and make it respect RLVa @setenv restriction) 2020-05-19 00:52:55 +02:00
Andrey Lihatskiy 510574dc14 Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	indra/llxml/llcontrolgroupreader.h
#	indra/newview/llviewerkeyboard.cpp
 2020-05-18 23:41:19 +03:00
Ansariel 67d20f4f4e Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2020-05-18 22:29:43 +02:00
Nat Goodspeed ed3d9abdd0 Increment viewer version to 6.4.3 
following promotion of DRTVWR-460
 2020-05-18 16:26:52 -04:00
Ansariel 824576d377 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-18 22:23:46 +02:00
Ansariel a1945ecdbd Correct "enabled" check for deferred rendering checkbox in phototools 2020-05-18 21:52:36 +02:00
Ansariel d6147f3d16 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-18 20:18:32 +02:00
PanteraPolnocy 485d5f441a FIRE-29563 Small translation update for Russian language, by Romka Swallowtail 2020-05-17 20:11:46 +02:00
Ansariel c43c56115b Make phototools layout a bit nicer 2020-05-17 18:53:52 +02:00
Ansariel 01c9f11bcd Add "Pause Clouds" button to phototools 2020-05-17 18:47:54 +02:00
Liny 9bbb5a03ef BUG-228760 Notecard editor external edit button graphical error 
Try 2
 2020-05-16 05:03:59 -07:00
Liny 02e713b392 Revert "BUG-228760 Notecard editor external edit button graphical error" 
This reverts commit 5cab84388a.
 2020-05-16 05:01:32 -07:00
Liny 5cab84388a BUG-228760 Notecard editor external edit button graphical error 2020-05-16 04:59:01 -07:00
Ansariel a357113793 Fix some merge screwup 2020-05-15 22:55:22 +02:00
Tonya Souther feba354666 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-15 08:19:30 -05:00
Tonya Souther c8667498e5 Break channel type for now so Windows builds can work. 2020-05-15 07:53:37 -05:00
Andrey Kleshchev 847cce915d SL-12237 Remade updates for invisible avatars 2020-05-15 14:43:12 +03:00
Nicky 0c6e6e25f8 Proper string conversion. 2020-05-15 00:05:12 +02:00
Andrey Lihatskiy ebc629ffc4 Merged in SL-12090 (pull request #105) 
SL-12090 Initialize the joystick only when required

* SL-12090 Initialize the joystick only when required

Approved-by: Andrey Kleshchev
 2020-05-14 07:51:08 +00:00
Nicky fe9ee89618 Merge branch 'Firestorm_6.3.9' 2020-05-12 17:32:13 +02:00
Nicky 39f3ceeed7 Make sure to always set something as a name for Bugsplat 2020-05-12 17:29:39 +02:00
Nicky 9908402334 Do not include SLLog in Bugsplat. 2020-05-12 17:26:59 +02:00
Nicky 0bcee91cf2 Next attempt to fi the elusive mesh crash. 2020-05-12 16:51:12 +02:00
Ansariel 945c7e4f64 Micro optimization in alphas drawpool 2020-05-10 23:21:33 +02:00
Ansariel 256ba88003 Re-add particle rendering optimization from dbfcd6c9c5 LL got lost for over 7 years now... 2020-05-10 23:13:53 +02:00
Ansariel d43632a938 Don't collect settings twice on first open of quickprefs / phototools 2020-05-10 22:17:37 +02:00
Ansariel 4b9aeb99e4 Collect all settings in one go 2020-05-10 22:01:37 +02:00
Ansariel 4a27359056 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-10 21:43:51 +02:00
PanteraPolnocy e06a61e80c FIRE-29549 Japanese translation update, by Hiroshi Kumaki 2020-05-10 21:28:05 +02:00
Ansariel 6769482797 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-10 21:14:02 +02:00
PanteraPolnocy 82bdf3c764 FIRE-29551 Small adjustments to Russian translation, by Romka Swallowtail 2020-05-10 21:00:53 +02:00
PanteraPolnocy c2034ec7d7 FIRE-29546 Russian translation update, by Romka Swallowtail 2020-05-09 20:18:37 +02:00
Mnikolenko Productengine 0828d7375a SL-12396 FIXED Last line can't be removed if it was selected via triple-clicking 2020-05-08 11:54:58 +03:00
Ansariel f89e5cbcb1 FIRE-29545: Backspace not working after triple-click selecting last line 2020-05-08 09:40:36 +02:00
Ansariel af2a73b57b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-08 09:32:52 +02:00
Ansariel 4e98c504d0 FIRE-29545: Backspace not working after triple-click selecting last line 2020-05-08 09:32:40 +02:00
Andrey Kleshchev 663489493e SL-12970 Fixed char length crash 2020-05-07 21:31:55 +03:00
PanteraPolnocy 7de86baaea FIRE-29543 Updated Japanese translation, by Hiroshi Kumaki 2020-05-07 17:26:37 +02:00
PanteraPolnocy 0fb13c712a Updated Polish translation 2020-05-07 16:41:40 +02:00
PanteraPolnocy dffe462ab3 FIRE-29544 Small addition for Russian translation (langauge settings file), by Romka Swallowtail 2020-05-07 16:37:18 +02:00