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

62 Commits (9abf29e9955b2ca039482ca2cb3fcffbe7375175)

Author SHA1 Message Date
Ansariel 73eabcb943 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep 2020-05-19 10:50:57 +02:00
Ansariel 4765655a72 Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-05-14 18:57:52 +02:00
Andrey Kleshchev 9c445f6edc Revert SL-8191 due to it no longer being valid 
This reverts commit 4c006e76e3.
Since EEP there are no 'basic shaders' and doing this in llfloatersettingsdebug was wrong either way
 2020-05-14 10:56:53 +03:00
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
 2020-04-23 19:21:00 +02:00
Ansariel fff65c73fd Merge branch 'DRTVWR-497' of https://bitbucket.org/lindenlab/viewer 2020-04-23 19:05:35 +02:00
Andrey Kleshchev 9d26ce372b Fixed merge conflicts 2020-04-20 22:48:03 +03:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Ansariel fcdb198a62 Merge viewer-cougar 2019-12-13 17:15:37 +01:00
ruslantproductengine 4c006e76e3 SL-8191 RenderUseVAO with Basic Shaders turned off caused textures not to show 
- Disable VAO for fixed pipeline + UI
 2019-09-30 21:01:22 +03:00
Ansariel 9f4d33d03b FIRE-24145: Fix build 2019-07-04 18:25:36 +02:00
ziree 9fec9aec37 Make Sanity Check warning icon call up the sanity checker dialog with fix it option. 2019-07-04 02:03:31 +02:00
Kitty Barnett 427c673268 Visualize LLSD debug settings in the settings floater 2017-03-13 20:04:31 +01:00
Ansariel cf9528018e Add Firestorm help SLUrl 2016-11-29 19:09:43 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Ansariel de9712a4ca Fix includes in llfloatersettingsdebug.cpp 2014-01-23 20:16:17 +01:00
Ansariel 18574ff5d3 Make llfloatersettingsdebug.cpp a bit more readable 2014-01-16 19:13:03 +01:00
Ansariel ce565580af FIRE-8367: Debug settings search doesn't properly filter 2014-01-16 19:03:44 +01:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master e41ca4b4b8 merge RLVa update 2013-11-11 00:40:45 -08:00
Liny b71f5ecca1 Make debug settings window search textbox focused on opening 2013-10-01 16:18:59 -07:00
Kitty Barnett 10a289598b Merged with default tip (Revision 74cc289067c8) 
--HG--
branch : RLVa
 2013-07-21 22:33:04 +02:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Ansariel a505ccf5f3 Build fix in llfloatersettingsdebug.cpp 2013-06-29 10:43:53 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Tank_Master 6425b3cd65 Merge RLVa SSB update 2013-02-24 18:24:48 -08:00
Kitty Barnett 0b8099dc75 - internal : hide locked debug settings with LLControlVariable::setHiddenFromSettingsEditor() 
--HG--
branch : RLVa
 2011-05-28 02:36:26 +02:00
Kitty Barnett 7b0455ba0f Merged with default tip (Revision 78d1d228709c) 
--HG--
branch : RLVa
 2011-03-19 16:14:42 +01:00
Aleric Inglewood 42604a1080 VWR-24315: update cached control values when resetting debug setting to default 2011-01-20 14:35:04 -05:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86) 
--HG--
branch : RLVa
 2010-10-30 17:28:00 +02:00
ziree a510ca889d Added settings sanity checking system. 2011-12-13 00:46:43 +01:00
ziree 334b88465f Debug settings now update in realtime with changes and disabling controls by RLVa commands has been restored. 2011-12-09 13:54:35 +01:00
ziree a21cf7ab22 Make debug settings not jump back to first list item on refocus. 2011-12-09 00:01:32 +01:00
ziree d82625d90b Added control name copy to debug settings, typing in search now auto selects the topmost entry, if any, added warning message to debug settings editor. 2011-12-08 00:15:08 +01:00
ziree 9f37f6cb46 Reworked debug setting to include a fulltext search and not updating once per frame. 2011-12-07 18:15:47 +01:00
Arrehn fa58cafc14 Merge from Kitty Barnett's RLVa 1.4 2011-08-06 13:59:08 -07:00
Kitty Barnett e6e551cb41 Merged with default tip (Revision 7a739cbdce56) 
--HG--
branch : RLVa
 2010-08-28 02:06:00 +02:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i 
--HG--
branch : RLVa
 2010-08-22 10:57:22 +02:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00