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

159 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Ansariel cefc6c4afc Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllocalbitmaps.h
#	indra/newview/llviewerregion.cpp
 2022-08-31 09:03:56 +02:00
Ansariel b0f88bef63 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-08-30 11:25:02 +02:00
Andrey Kleshchev 0d217dc73c SL-17653 Local gltf materials #2 2022-08-23 00:23:05 +03:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Ansariel 7ff7317779 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-02 09:35:11 +02:00
Mnikolenko Productengine 66793abc71 SL-14075 allow exporting multiple textures with the same name 2021-07-02 16:11:39 +03:00
Ansariel fd06acc270 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 21:22:24 +01:00
Ansariel 47d9576f04 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 19:16:15 +01:00
Beq 18e3791bb2 FIRE-30559 Preview texture priority handling to give better response 2021-02-08 14:51:37 +00:00
Ansariel abc27703e6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 22:50:13 +01:00
Ansariel 7041d80d74 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-02 13:34:58 +01:00
Andrey Lihatskiy 185082f1bb Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2021-02-01 22:14:44 +02:00
Ansariel 273e5bc449 Respect FSTextureDefaultSaveAsFormat debug setting when multi-saving textures 2020-11-04 15:40:48 +01:00
Ansariel 22b2d0d4e0 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-04 15:33:34 +01:00
Mnikolenko Productengine 73303d9184 SL-14075 Allow bulk download of textures/pictures 2020-11-02 19:35:31 +02:00
Ansariel 80803b9ae9 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-06-25 11:44:06 +02:00
Mnikolenko Productengine 657c37e718 SL-13487 File extension checks should ignore case 2020-06-19 19:09:00 +03:00
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles 
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
 2019-07-19 11:21:54 +02:00
maxim_productengine dbe5eb8a1d SL-11431 [Legacy Profiles] Clicking someone else's profile picture should open image modal. 2019-06-25 17:54:21 +03:00
Ansariel 54d8422937 FIRE-22851: Show texture "Save as" file picker subsequently instead all at once 2018-08-01 16:06:23 +02:00
Ansariel 5d3ba25bf2 Merge viewer-neko 2018-06-01 20:27:39 +02:00
maxim_productengine f2113a037c MAINT-8700 Remove obsolete code and update 'Save texture' file dialog 2018-05-31 14:59:31 +03:00
Ansariel 0c7ed286bb MAINT-7461 Fixed images not showing at correct proportions when opened for the first time 2017-06-07 21:28:01 +02:00
andreykproductengine 40011e3b65 MAINT-731 Fixed Images Do Not Show at Proper Proportions 2017-05-30 16:28:07 +03:00
Ansariel b18ac29403 FIRE-20150: Add refresh button to texture preview 2016-09-27 13:44:40 +02:00
Ansariel ea28514d3b Merge Firestorm LGPL 2016-07-04 16:10:45 +02:00
Ansariel 12bd27aa2e Experiment: Remove NO_DELETE state of textures used in preview or texture control to get them removed from memory again 2016-06-17 16:04:23 +02:00
Ansariel 267007f963 Merge Firestorm LGPL 2016-06-09 15:29:14 +02:00
Ansariel 5f03839836 FIRE-19397: Right-click copy asset ID option for textures in library is inconsistant 2016-05-31 21:35:02 +02:00
Ansariel f68896905b Merge Firestorm LGPL 2016-05-23 16:09:09 +02:00
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02:00
andreykproductengine e302b6f1f4 MAINT-2063 Fixed User had ability to delete Notecards and textures from library 2016-04-22 18:41:45 +03:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel a0fa2e5762 Merge viewer-bear 2016-02-19 10:30:02 +01:00
Kitty Barnett 26bd519536 FIXED Crash in LLPreviewTexture destructor 2016-02-13 15:29:02 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
andreykproductengine 47ae78f8cf MAINT-7461 Fixed images not showing at correct proportions when opened for the first time 2017-06-07 16:21:40 +03:00
andreykproductengine a8fffc7d17 MAINT-731 Fixed Images Do Not Show at Proper Proportions 2017-05-30 16:28:07 +03:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
Ansariel e61c4c8cfa FIRE-14111: File extension missing on Linux when saving a texture; Based on a patch contributed by Lance Corrimal 2015-06-22 10:19:17 +02:00
Mnikolenko ProductEngine 5e241cf621 MAINT-1850 FIXED Update Preview tittle and description after setting texture's id. 2015-05-29 13:23:36 +03:00
Ansariel 7e83b3b978 Save button showing on texture floater in preview mode 2015-05-16 03:28:46 +02:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Mnikolenko ProductEngine 015e979632 MAINT-1774 FIXED Don't open preview texture floater if user clicks "Cancel" button. 2014-12-10 12:32:51 +02:00
andreykproductengine 4734125659 MAINT-4710 FIXED The 'Copy to inventory' button should be disabled in Texture preview floater when permissions forbid it 2014-12-02 19:47:47 +02:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Nicky a7111940bc Replace childSetText with childSetValue and add missing includes for LLViewerRegion. 2014-06-10 12:34:16 +02:00