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

106 Commits (31c3f5f9be05bb047e63e483bf64b8bd09cd8995)

Author SHA1 Message Date
PanteraPolnocy 3469577978 FIRE-32944 - Hide some items if texture is invalid 2023-05-22 18:32:53 +02:00
Zi Ree b8cb3845dd FIRE-32913 - fix crash when image to be uploaded is invalid in some way 2023-05-01 02:52:57 +02:00
Zi Ree 1ac600f383 FIRE-32893 - fix crash on image upload, make sure to grab the checkbox pointer even when there is no alpha channel at all 2023-04-20 03:49:52 +02:00
Zi Ree e770782e99 Image upload preview now tells you the final upload size and alpha status, also some minor XUI cleanup and alignment 2023-04-04 13:49:53 +02:00
Zi Ree 29b9da8895 Make upload image preview area to be not hard-coded but follow one XUI element, so the UI can be changed easier without changing code. 2023-04-04 11:10:51 +02:00
Zi Ree 9f6fff9af4 Add detection of empty/almost empty alpha layers in image uploads and strip those layers by default, unless instructed otherwise. 2023-03-27 22:00:14 +02:00
Ansariel 028941652b Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llrender/llvertexbuffer.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewer.h
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewershadermgr.cpp
#	indra/newview/pipeline.cpp
 2021-12-01 22:29:25 +01:00
Dave Houlton 68e09edad0 SL-16386 remove references to (const true) LLGLSLShader::sNoFixedFunction 2021-11-30 17:04:35 -07:00
Ansariel 6afd505fa8 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 2020-05-05 15:24:10 +02:00
Andrey Lihatskiy ec9b989863 Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
#	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
 2020-05-05 00:37:16 +03:00
Beq 11c97e6fb9 Kill misleading "lossless" prompt in image upload 
Fix for BUG-228331
 2020-03-18 19:25:07 +00:00
Andrey Kleshchev 9df7f5728b SL-12870 Misleading UI value 2020-03-18 21:08:55 +02:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
Mnikolenko Productengine f1a6e776b4 SL-12097, SL-12098, SL-12099 UI update for Texture, Animation and Sound upload fees 2019-11-25 22:52:07 +02:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel d799bec7d8 Merge Firestorm LGPL 2018-05-18 14:46:58 +02:00
Ansariel 999163b3f5 Merge viewer-neko 2018-02-12 21:45:05 +01:00
andreykproductengine 0d40ac2ed9 MAINT-8258 Don't show sculpty until it is loaded or load fails 2018-02-07 20:41:53 +02:00
Ansariel b5b4b58cc0 Merge axon 2017-12-05 10:46:01 +01:00
Brad Payne (Vir Linden) 4b439ff968 SL-704 - made avatar hierarchy more consistent by adding lluiavatar for viewer-local avs used in upload previews 2017-12-04 11:15:47 +00:00
Ansariel c606bc3492 Merge viewer-lynx 2017-11-12 12:28:28 +01:00
andreykproductengine 149b2d88dd MAINT-7228 Vertex buffer allocation failure handling 2017-11-01 19:36:13 +02:00
Ansariel d19b330deb Fix vertex windings 2017-03-10 21:31:56 +01:00
Ansariel 0c4c1b5968 Remove deprecated OpenGL QUADS rendering mode 2017-03-04 23:57:37 +01:00
Ansariel c182741596 Merge viewer-lynx 2016-11-16 09:55:54 +01:00
Brad Payne (Vir Linden) 7a006ea3a2 merge 2018-05-18 18:40:36 +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
Nicky 8c91463476 FIRE-12968; Even though the root cause is likely the shader memory overrun, preseed the VBO pools to take some strain from the driver. Remove the LLStrider changes while at it, those are not used in the Havok version and have not triggered anything in the OS version since month. 2014-03-10 00:45:41 +01:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Cinders 5cfd3c2e7d Hide the temp uploads checkbox when attempting to upload a very large image. 2013-09-28 17:59:53 -06:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nicky af17cbce9f Forgot the #ifdefs for the Havok enabled version, so setCount of llstrider is only called on non Havok builds. 2013-04-20 03:31:54 +02:00
Cinders 3a02cfbe37 Fix FIRE-9613 & FIRE-9621 2013-04-02 14:33:03 -06:00
Nicky 0d4ecdefa4 Protect VBOs against buffer overflows. 2013-03-25 16:19:47 +01:00
Dave Parks ec125540c4 MAINT-643 Fix for incorrect lighting and colors in preview displays. 2012-10-16 16:25:01 -05:00
Don Kjer e1580128ab Fixed crashes on login. Moved most of the remaining character/skeleton generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint. 2012-09-09 12:12:19 +00:00
Nyx (Neal Orman) 77b33d9623 SH-3264 Porting over the XML loading of the avatar structure to llappearance 
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
 2012-09-07 23:17:34 -04:00
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Tank_Master ea86bb88c3 first pass merge 2013-02-04 10:52:32 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Tank_Master 8cb09ca444 Merge to FS LGPL 29865 2012-08-30 15:45:02 -07:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta 
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
 2012-07-16 21:59:14 -07:00
simon@Simon-PC.lindenlab.com 71bbb384b0 MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null pointer checks are good. 
Reviewed by Kelly
 2012-05-07 13:24:52 -07:00
Nicky d858030301 FIRE-3661; add color uniform to previewV.glsl. 2012-07-19 00:17:37 +02:00
callum b41e66c1cb EXP-1511 REFIX Preview image overlays ui elements in Upload image floater 
Tweaked offset and missed a corner case
 2012-01-11 17:15:06 -08:00
callum c4a08e6c9d EXP-1511 FIX Preview image overlays ui elements in Upload image floater 2012-01-09 14:42:34 -08:00