Commit Graph

60248 Commits (a1945ecdbd457cb807d8d03f2e2cea9d564b2cbc)

Author SHA1 Message Date
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
Nicky 0c6e6e25f8 Proper string conversion. 2020-05-15 00:05:12 +02: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
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
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
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
Ansariel 017b0210eb Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-07 14:29:07 +02:00
Ansariel 3074970e29 Add missing region type string 2020-05-07 14:28:47 +02:00
PanteraPolnocy 4fefb8c626 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-07 13:54:12 +02:00
PanteraPolnocy da635a0b84 FIRE-29544 Russian translation update, by Romka Swallowtail 2020-05-07 13:53:58 +02:00
Ansariel c165d7f69f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-07 13:51:46 +02:00
Ansariel 12d21bf1c5 Stupid Git insists the line endings in these files are wrong... 2020-05-07 13:46:23 +02:00
Zi Ree bd5d141bca FIRE-29541 - Add 3 pixels to the top of the moveview floater to make it easier to grab 2020-05-07 01:36:06 +02:00
Zi Ree be3c11bd10 FIRE-29542 - only update UI when another set is actually selected 2020-05-06 17:09:26 +02:00
Ansariel 181acbb927 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-06 09:54:58 +02:00
Liny 6935e7a303 Use the better looking OpenSim logo provided by Ai Austin on the JIRA. 2020-05-05 18:56:59 -07:00
Ansariel b051fdc1bb Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-05 19:56:32 +02:00
Ansariel 0615db588d Fix XUI parser warnings in menu_viewer.xml 2020-05-05 19:54:29 +02:00
Ansariel 7c8269c180 Fix XUI parser warning in slider_bar.xml widget 2020-05-05 19:50:20 +02:00
Ansariel ab369297b2 Remove non-existing setting VertexShaderEnable from feature table 2020-05-05 19:43:26 +02:00
Ansariel 863a662c6f Add missing log output 2020-05-05 17:19:21 +02:00
Liny 55a8455f04 FIRE-29526 [Opensim] Discord to show the grid being used instead of Second life constantly. 2020-05-04 22:36:39 -07:00
Ansariel 9b6ea36a52 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2020-05-04 19:55:28 +02:00
Ansariel e73725f229 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-04 19:54:42 +02:00
Ansariel 95632ec229 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-05-04 19:53:03 +02:00
Nat Goodspeed 4a7fd0117a Increment viewer version to 6.4.2
following promotion of DRTVWR-500
2020-05-04 12:15:30 -04:00