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

252 Commits (07ff9a5d67cefdae1bc112b19947f7ba173c9dbb)

Author SHA1 Message Date
Alexander Gavriliuk 0e837fbaad Fix formatting in indra/newview/llpanelface.* files 2023-02-27 21:46:54 +01:00
Andrey Lihatskiy 51efcfea25 DRTVWR-544 Post-merge build fix 2022-08-04 01:51:07 +03:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint 
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
 2022-08-04 00:17:55 +03:00
Mnikolenko Productengine 8112cefa73 SL-16026 FIXED Copying only one diffuse texture allows pasting this texture into other types of textures 2022-04-26 19:07:39 +03:00
Mnikolenko Productengine 2445525cc5 SL-17231 Copying textures should be disabled if object content was not yet updated 2022-04-19 02:33:59 +03:00
Mnikolenko Productengine bbdbd6c2dd SL-17204 FIXED The texture with full permissions is settled on the prim after copying texture from the object with texture with no transfer permission 2022-04-15 22:14:38 +03:00
Andrey Kleshchev bb71cbed04 SL-16344 #6 Fixed 'choose media' button not working in some cases 2022-02-01 23:52:27 +02:00
Andrey Kleshchev 05693d480f SL-16344 #5 Cleanup 2022-01-18 19:44:09 +02:00
Andrey Kleshchev 2b47ed1eeb SL-16344 #4 Only load 'title' media if it is needed 
Mostly for the sake of MAC. setVolume(0) doesn't work on MAC which resulted in invisible media playing in background when editor was open.
 2022-01-17 23:44:07 +02:00
Andrey Kleshchev 8ea7867528 SL-16344 #3 Moved LLPanelFace related code into LLPanelFace 2022-01-17 20:45:46 +02:00
Andrey Lihatskiy 098c4c0371 Merge branch 'master' into DRTVWR-486 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelvolume.h
 2021-11-16 01:45:17 +02:00
Mnikolenko Productengine a95d846a5c SL-16218 treat texture selection similar to diffuse map handling. 2021-10-25 15:15:02 +03:00
Andrey Kleshchev 4c69f9ebb1 Merged master(DRTVWR-497) into DRTVWR-486 2020-09-28 21:21:29 +03:00
Andrey Lihatskiy 966f1ac84e Merge branch 'master' into DRTVWR-486 2020-09-23 01:48:27 +03:00
Dave Houlton 86e7cc3d35 Merge branch 'master' v6.4.9 into DRTVWR-497 2020-09-22 15:28:13 -06:00
Andrey Kleshchev 3fde31b610 SL-12688 Fixed Warning 2020-07-02 18:36:19 +03:00
Andrey Kleshchev ccf51f173c SL-12334 Texture UUID is not copied to clipboard from a full-perms object 2020-07-02 17:21:09 +03:00
Andrey Kleshchev 46b037aabd SL-12688 Restored stricter permission requirements 
You need to own texture in inventory to be able to copy it
 2020-06-25 23:53:55 +03:00
Andrey Kleshchev f3216ca1cd SL-12688 Warnings part #2 2020-06-24 19:00:48 +03:00
Andrey Kleshchev 23f20c207d SL-12688 Warnings part #1 2020-06-23 22:02:33 +03:00
Andrey Kleshchev 8590a8efe6 SL-13359 #9.5 Texture tab 2020-06-19 22:45:20 +03:00
Andrey Kleshchev 052e1adcd0 SL-13359 #9 Texture tab 2020-06-19 22:18:31 +03:00
Andrey Kleshchev 15f02e2da2 SL-13359 #8 Reverted changes to texture tab 
This reverts commit 1e1707d532.
 2020-06-19 22:17:38 +03:00
Andrey Kleshchev 1310fac3b1 SL-13359 #5 Implemented revised changes 2020-06-17 23:39:42 +03:00
Andrey Kleshchev 090bb3e6de SL-13359 #1 Revert floater_tools and object panel changes 2020-06-02 16:58:28 +03:00
Andrey Lihatskiy f4c7c8aff5 Post-merge build fixes 2020-04-26 21:15:54 +03:00
maxim_productengine c34f9c28b0 SL-12473 FIXED Copied texture params get duplicated when pasting to objects that use different face counts. 2020-02-19 17:15:20 +02:00
Andrey Lihatskiy e0727702ea Merge branch 'DRTVWR-501' into trunk 2020-02-03 15:18:34 +02:00
maxim_productengine e83da3f5e2 SL-12453 FIXED The "Align planar faces" checkbox is visible in the Default mapping mode 2019-12-16 14:36:33 +02:00
andreykproductengine ee3ae8cb4a SL-12334 Reduce inventory use 2019-12-12 15:05:14 +02:00
andreykproductengine eaa4e977d6 SL-12334 [Copypaste] Texture is not copied to clipboard from a full-perms object 2019-12-11 22:48:46 +02:00
maxim_productengine b3d57f93b6 SL-12413 FIXED [Project Copy/Paste] Bumpiness/Shininess parameters are not pasted from the clipboard 2019-12-09 17:26:16 +02:00
maxim_productengine 0a411b0b1a SL-12374 FIXED [Project Copy/Paste] Normal & specular texture UUIDs are copied to clipboard from no-copy or no-transfer objects 2019-12-03 17:31:46 +02:00
maxim_productengine 4fcf31e203 SL-12287 FIXED [Project Copy/Paste] Unable to paste texture from "local" storage 2019-11-15 17:58:32 +02:00
andreykproductengine 0afe586856 SL-12289 Build fix 2019-11-15 15:40:09 +02:00
andreykproductengine 87fd7cbea5 SL-12289 'Copy media face' support 2019-11-14 21:22:10 +02:00
AndreyL ProductEngine 360f2eb0b9 Merged in lindenlab/viewer-release 2019-11-13 16:42:27 +02:00
andreykproductengine c17a08721b SL-12244 Copying a no transfer texture does not set target object to no transfer 2019-11-11 17:21:33 +02:00
andreykproductengine 448eff8307 SL-12212 Unable to copy-paste Color, Transparency and Glow settings 2019-11-04 17:00:21 +02:00
AndreyL ProductEngine a09f68a809 Buildfix (typo) 2019-10-17 02:46:09 +03:00
AndreyL ProductEngine be7d81626e Buildfix (typo) 2019-10-15 19:20:36 +03:00
Kadah_Coba add1462917 Merged in andreyl_productengine/486-copypaste 2019-10-14 20:44:51 -07:00
Kadah_Coba 1e1707d532 [Project Copy/Paste] Texture support 2019-10-14 20:35:44 -07:00
AndreyL ProductEngine 4dd3d230ec Merged in lindenlab/viewer-release 2019-11-14 23:44:45 +02:00
ruslantproductengine 2b8acfea0e SL-11840 [Bakes on Mesh] Enable bake textures to be applied to non-attached editable items 
- Now bake texture channel's available for assign for non attached objects
 2019-10-18 22:38:33 +03:00
andreykproductengine e439f0366f Merge from lindenlab/viewer-release 2019-08-29 15:43:02 +03:00
andreykproductengine be7713cab2 Merged in lindenlab/viewer-release 2019-08-14 15:02:56 +03:00
Brad Payne (Vir Linden) 15db923cae merge 2019-08-13 20:08:37 +01:00
andreykproductengine 8369276a49 DRTVWR-493 LLViewerMedia to singleton 2019-06-21 20:55:39 +03:00
Anchor 504a138cb1 Merge 2019-05-10 12:22:29 -06:00