Commit Graph

242 Commits (d82f98180c7ddd2feb247f5b0737c926ca94c5ba)

Author SHA1 Message Date
Ansariel d82f98180c Merge Firestorm LGPL 2019-07-12 20:13:35 +02:00
Liny b073349a12 Forgot one place
Patch from Chaser Zaks
2019-06-25 22:50:02 -07:00
Liny 07deb7b5a7 FIRE-24113 - Texture Picker UUID string change to 0s when you don't own the texture
Patch from Chaser Zaks
2019-06-25 22:05:02 -07:00
Ansariel 0ec08c1b0f Merge viewer-eep 2019-05-21 18:22:45 +02:00
Tonya Souther f45c19cdb3 FIRE-14230: Allow applying a texture via UUID to the current selection in the texture picker. Patch from Chaser Zaks. 2019-06-22 15:14:41 -05:00
Ansariel 0d674ea43f Fix merge error 2019-05-13 20:32:17 +02:00
Ansariel e6970af7a1 Merge Firestorm LGPL 2019-05-09 19:52:27 +02:00
Graham Linden 42fa05bd4c Remove unref'd vars for Clang. 2019-05-08 12:49:02 -07:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
Ansariel 53cea223fe Merge Firestorm LGPL 2019-02-14 19:56:05 +01:00
Ansariel f8ad1551b3 Merge viewer-eep 2019-02-10 13:12:23 +01:00
Ansariel d0be7ba28b FIRE-23582: Fix texture picker opens wrong floater when pressing space in preview mode 2019-02-08 20:18:35 +01:00
andreykproductengine ac865de287 SL-1945 Day Cycle Editor Copy Track 2019-01-25 22:02:16 +02:00
Ansariel dd2636a2c2 Merge viewer-neko 2019-01-10 21:10:36 +01:00
maxim_productengine ab428e194e SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture 2019-01-04 10:57:49 +02:00
Ansariel f9ec853f4a Merge viewer-neko 2019-01-03 19:07:09 +01:00
maxim_productengine ec3e360098 SL-1866 FIXED [OSX] Viewer crashes when the user changes avatar after editing texture 2019-01-04 10:57:49 +02:00
maxim_productengine bf2efcf43e SL-10233 FIXED 'Default' button doesn't work in 'Pick:Texture' floater for multiple selections with different textures 2018-12-14 16:48:54 +02:00
Ansariel e97c25531c Merge viewer-neko 2018-05-25 22:05:19 +02:00
maxim_productengine 3c12c7ce56 MAINT-8619 Disable local textures for selection in Group profile 2018-05-23 11:58:42 +03:00
Ansariel 0c4c1b5968 Remove deprecated OpenGL QUADS rendering mode 2017-03-04 23:57:37 +01:00
Ansariel 16acd2d20a Merge Firestorm LGPL 2016-12-04 14:05:44 +01:00
Ansariel 61193e6b36 FIRE-12217: Add threaded filepicker for local textures picker 2016-12-03 17:44:36 +01:00
Ansariel e2919977d6 Merge viewer-lynx 2016-11-30 11:15:04 +01:00
Mnikolenko Productengine 334d853527 MAINT-6961 FIXED Some textures(copied from Library) couldn't be set as Outfit image via "Select image" although drag and drop works fine 2016-11-25 16:12:31 +02:00
AndreyL ProductEngine fb0355fdba Merged in Ansariel/storm-2141 2016-11-21 21:18:13 +02:00
Ansariel 420b1c9429 STORM-2141: Fix various inventory floater related issues:
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
Mnikolenko Productengine 98e955e3ac MAINT-6961 FIXED Some textures(copied from Library) couldn't be set as Outfit image via "Select image" although drag and drop works fine 2016-11-25 16:12:31 +02:00
Ansariel f1011a1e19 Merge Firestorm LGPL 2016-10-11 21:08:24 +02:00
Ansariel e057285ecd Use CTRL-F focus the local search editor of a window if available (can be disabled via FSSelectLocalSearchEditorOnShortcut) 2016-10-11 09:45:49 +02:00
Ansariel 2cd7b679db Merge Firestorm LGPL 2016-10-01 16:24:43 +02:00
Ansariel eb6d5e7004 Merge cleanup 2016-09-16 15:07:42 +02:00
Ansariel c04b9df0bb Merge Firestorm LGPL 2016-09-15 23:56:09 +02:00
AndreyL ProductEngine c2b6620572 Merged in lindenlab/viewer-release 2016-09-15 23:21:15 +03:00
Ansariel 09b9913d35 Merge viewer-vob 2016-08-29 11:40:53 +02:00
Mnikolenko Productengine c37b822abf MAINT-6616 new crash in VOB viewer in snapshot preview 2016-08-23 18:53:27 +03:00
Ansariel 4da402dd23 Merge viewer-bear 2016-08-21 12:39:18 +02:00
andreykproductengine 0f06168991 MAINT-6655 Group inspector doesn't support default icon. 2016-08-17 20:35:00 +03:00
Ansariel 3fe595953f Initial merge of viewer-vob - viewer starts, but still lots of bugs and crashes 2016-08-08 12:46:44 +02:00
Mnikolenko Productengine 84677aad4c MAINT-6602 disable ability to select local textures 2016-08-01 15:18:32 +03:00
Mnikolenko Productengine 0888078bd8 MAINT-6601 FIXED [VOB] Texture picker generates WARNING spam in SecondLife.log 2016-07-29 12:44:52 +03:00
pavelkproductengine 7187ec75a7 MAINT-6476 VOB - User can add any size image to an Outfit Gallery outfit folders
Added restriction of image size that can be added to outfit via "Select Photo"
2016-07-26 19:18:03 +03: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
pavelkproductengine 4d9b3cd725 Merge VOB with release 4.0.6 2016-05-24 18:37:20 +03:00
Mnikolenko Productengine b1243c55e5 Merged in oz_linden/maint-5974 2016-05-10 16:09:25 +03: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
pavelkproductengine 808b8ed018 MAINT-6228 Update Photo/Image Upload feature for Outfit Browser
1) Added "Select Photo" to outfit gear menu
2) Incorporated Texture Picker
2016-04-05 17:44:53 +03: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