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

93 Commits (56da70fa9651164e577caaf866fccec684bbd577)

Author SHA1 Message Date
Ansariel 7392f82e71 Merge Firestorm LGPL 2018-06-21 20:56:19 +02:00
Ansariel 4aa45cb8e1 Merge viewer-baking-updates 2018-06-16 13:22:49 +02:00
Anchor Linden 7abb0c99be [DRTVWR-476] - add universal head,upper,lower tattoos 2018-06-13 01:09:27 +05:30
Anchor Linden 56fc3222dc [DRTVWR-476] - create new wearable type 2018-06-08 20:36:49 +05:30
Ansariel fbea5dbc90 Replace remaining GenericXXXFilePicker with the default LL implementation 2018-06-07 22:15:37 +02:00
Ansariel 31b62685f2 Merge viewer-baking-updates 2018-05-22 17:23:58 +02:00
Anchor Linden 0fdbe7e34d Merge 2018-05-21 16:47:42 -07:00
Anchor Linden 3bf89821d9 [DRTVWR-455] - added 5 new bake channels 2018-05-21 16:00:52 -07:00
Ansariel 6219aec54f Merge viewer-neko 2018-03-02 10:52:44 +01:00
andreykproductengine d9064d3a4e MAINT-8317 Fixed Local Textures for Advanced Lighting Projectors do not keep the selected texture. 2018-02-27 15:49:15 +02:00
Ansariel e8a008684e Add convenience methods for generic threaded filepickers 2016-12-04 21:00:32 +01:00
Ansariel 61193e6b36 FIRE-12217: Add threaded filepicker for local textures picker 2016-12-03 17:44:36 +01:00
Ansariel e18d32ee13 Merge viewer-bear 2016-09-12 20:58:57 +02:00
Mnikolenko Productengine d6b0db5118 MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters 2016-08-26 17:02:32 +03:00
Nicky d05708f4b3 FIRE-19855; use wide character path name for windows. 2016-08-17 22:45:57 +02:00
Ansariel a0188a5358 Merge Firestorm LGPL 2016-05-09 12:41:24 +02:00
Oz Linden 950c41d184 merge 4.0.4-release and MAINT-5974 2016-05-06 10:28:42 -04:00
Ansariel df4205dc46 Merge viewer-bear 2016-04-02 03:52:29 +02:00
andreykproductengine 0e155c51a9 MAINT-6257 Textures loading issues. 2016-03-29 18:52:54 +03:00
Ansariel d171e16c58 Merge Firestorm LGPL 2016-03-18 10:16:25 +01:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
andreykproductengine 30f9287645 MAINT-2199 reverted previous change, refixed missing cloud and ban line 2016-03-03 00:15:33 +02:00
andreykproductengine b3e7fff9ae MAINT-2199 restored original UI mechanics, removed icons from UI list 2016-02-27 16:06:54 +02:00
Ansariel 0a741843ca Merge viewer-bear 2016-02-21 02:35:15 +01:00
andreykproductengine 10e2bd56c1 MAINT-2199 In some rare cases priorities can change, it shouldn't affect texture list. 2016-02-18 17:35:43 +02:00
andreykproductengine a0e9ee4757 MAINT-2199 separating UI elements from in-world textures. 2016-02-16 20:44:53 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 5fe09cb64d Merge Viewer-Bear 2015-08-22 03:13:17 +02:00
andreykproductengine d9341caf45 MAINT-5364 FIXED Object with invalid sculpt topology type cannot be seen or selected 2015-07-17 17:36:33 +03:00
Ansariel a45d3d8421 Merge Viewer-Bear 2015-06-20 15:35:15 +02:00
andreykproductengine b59770199a Merge from viewer-release 2015-06-05 16:30:04 +03:00
simon 316bdc0ab0 Merge viewer-release and become version 3.7.30 2015-06-08 14:54:22 -07:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
Brad Payne (Vir Linden) 3ae8a821c3 merge 2015-04-24 08:55:20 -04:00
Brad Payne (Vir Linden) 32940ee90b merge 2015-04-13 17:19:27 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Mnikolenko ProductEngine 65e6cc6704 MAINT-5039 FIXED Viewer crashes at logout if wearing clothing textured with a local texture 2015-03-31 12:51:07 +03:00
ruslantproductengine 90573badb4 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
ruslantproductengine a6ff7db101 MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
Brad Payne (Vir Linden) 6aa63dce33 SL-103 WIP - viewer enforces wearable limits based on total articles of clothing rather than per-type limit. Limit is artificially low for testing, will bump before release. 2015-03-05 16:17:45 -05:00
Ansariel 0e2a827873 Merge LL V3.7.30 2015-05-27 00:27:29 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
ruslantproductengine befb4449dc MAINT-3585 FIXED (Crashes when attempting to upload image.) 2015-03-30 20:11:27 +03:00
Ansariel 0c709f7e5e Improved check + EOL 2015-03-26 21:51:28 +01:00
Ansariel a84cad1d7d FIRE-15787: Crash fix 2015-03-26 21:17:35 +01:00
ruslantproductengine 799d13269a MAINT-3585 FIXED Viewer Crashes when attempting to upload image. 
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Сhange's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
 2014-11-03 20:05:20 +02:00
ruslantproductengine b008385a50 FIRE-12732/MAINT-3585 FIXED Viewer Crashes when attempting to upload image 
on OS X.
The bug was fixed, the reasone of crash is following. The Core Flow view
contain another GL context and will not care about restoring a previous.
I restore context manually.
This path also contain a minor changes in another files.

All changes described here.

Change's for fix current bug.
indra/llwindow/llwindow.h
indra/llwindow/llwindowheadless.h
indra/llwindow/llwindowmacosx.h
indra/llwindow/llwindowsdl.h
indra/llwindow/llwindowwin32.h
indra/newview/lllocalbitmaps.cpp
indra/newview/llviewerdisplay.cpp
indra/newview/llviewerdisplay.h

Twice mUsage initialization (replace to forward initialization).
indra/llcharacter/lljointstate.h

Looks like condition should be befor memcopy call, otherwise - possible CRASH.
indra/llcommon/llmd5.cpp

Unused condition and variables.
indra/llmath/llsphere.cpp

Looks like should be under if otherwise - possible CRASH
indra\llprimitive\llmodel.cpp

Useless assert's.
indra/llrender/llrender.cpp
indra/newview/lldaycyclemanager.cpp
 2014-11-03 20:05:20 +02:00
Ansariel 546b276eba Fix merge issue 2015-01-18 17:18:23 +01:00