Dave Houlton
|
2386125ae0
|
Merge master into DV525-merge-6.4.19
|
2021-04-29 11:40:22 -06:00 |
|
Dave Houlton
|
303feae305
|
Merge branch 'master' v6.4.17 into DRTVWR-525
|
2021-03-10 09:34:16 -07:00 |
|
Andrey Lihatskiy
|
bb17e4b78e
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-09 21:56:14 +02:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Dave Houlton
|
363bc9d9d0
|
Merge branch 'master' v 6.4.15 into DRTVWR-525
|
2021-03-02 14:25:36 -07:00 |
|
Andrey Lihatskiy
|
35550e36db
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-02 21:41:26 +02:00 |
|
Mnikolenko ProductEngine
|
12d2bf4786
|
SL-14286 fixed crash when closing viewer while file picker is open
|
2020-11-18 21:09:57 +02:00 |
|
Callum Prentice
|
1cdcc00319
|
Mostly automatic merge with canonical viewer after release
|
2020-10-14 13:47:26 -07:00 |
|
Dave Houlton
|
52af846672
|
DRTVWR-510 merge master 6.4.11
|
2020-10-14 14:46:16 -06:00 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Ptolemy
|
4c44366c0b
|
SL-13888 Coding Standard: be consistent; use TAB indent
|
2020-09-24 11:26:46 -07:00 |
|
Ptolemy
|
88e7c15c2b
|
SL-13888 Restore back face culling being accidently removed in SL-12781
|
2020-09-24 11:20:09 -07:00 |
|
Andrey Kleshchev
|
1ef4591381
|
SL-13821 Fixed checkbox not disabling
|
2020-09-23 12:10:06 +03:00 |
|
Callum Prentice
|
2e6f516411
|
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
|
2020-09-16 21:12:53 -07:00 |
|
Callum Prentice
|
3fc07dea01
|
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
|
2020-09-16 18:53:24 -07:00 |
|
Andrey Kleshchev
|
0ee7e9dadb
|
SL-13821 Fix upload options affecting preview options incorrectly
|
2020-08-19 23:26:44 +03:00 |
|
Andrey Kleshchev
|
1f2ceb97ec
|
SL-13583 Some behavior tweaks #2
|
2020-08-12 22:53:23 +03:00 |
|
Andrey Kleshchev
|
777e896ee4
|
DRTVWR-482 Use proper reshape procedure and fix hidden borders
|
2020-08-11 21:28:05 +03:00 |
|
Andrey Kleshchev
|
0570d6d3c1
|
SL-13483 Rename Avatar tab to "Rigging"
|
2020-07-27 22:32:49 +03:00 |
|
Mnikolenko Productengine
|
70fe69ea43
|
SL-13189 Mesh uploader - Autofill from _postfixes
|
2020-05-12 19:02:48 +03:00 |
|
Andrey Kleshchev
|
4ac08f1ac5
|
SL-13123 Cleanup
|
2020-04-25 15:12:53 +03:00 |
|
Andrey Kleshchev
|
aa014a65e7
|
SL-13123 Bind shape matrix orientation warning is misbehaving
|
2020-04-24 20:51:07 +03:00 |
|
Andrey Kleshchev
|
3cc83b2e37
|
SL-307 Improvements to logging
|
2020-04-24 18:29:18 +03:00 |
|
Andrey Kleshchev
|
a0e91e9e50
|
SL-307 Improvements to flashing color
|
2020-04-24 18:05:14 +03:00 |
|
Andrey Kleshchev
|
0bc76461fa
|
SL-13080 Mac build fix
|
2020-04-24 02:47:18 +03:00 |
|
Andrey Kleshchev
|
c0ed9d28f1
|
SL-13080 Filter out default overrides
|
2020-04-24 02:37:35 +03:00 |
|
Andrey Kleshchev
|
9221c8a3f6
|
SL-13080 Changes for joint listings in mesh uploader
|
2020-04-23 20:51:06 +03:00 |
|
Andrey Kleshchev
|
72ba7f1dad
|
SL-13077 remove floater specific variables from settings.xml
|
2020-04-22 20:55:57 +03:00 |
|
Andrey Kleshchev
|
2b459cc80e
|
SL-13078 Split LLModelPreview and LLFloaterModelPreview into separate files
|
2020-04-22 20:02:39 +03:00 |
|
Mnikolenko Productengine
|
462b0b1c2d
|
SL-13066 FIXED Model preview with is displayed when the ‘Upload Model’ floater is minimized
|
2020-04-22 15:57:34 +03:00 |
|
Andrey Kleshchev
|
311921cad6
|
SL-13064 Artifacts on the preview with physics
|
2020-04-21 17:33:14 +03:00 |
|
Mnikolenko Productengine
|
1f8f3d13d0
|
SL-10613 The Smooth parameter should be 0 by default
|
2020-04-21 15:41:42 +03:00 |
|
Andrey Lihatskiy
|
9aa7485d61
|
SL-13075 Fixed the uploaded model preview size
|
2020-04-21 13:36:03 +03:00 |
|
Andrey Lihatskiy
|
a4b1c0330a
|
Merge branch 'master' into DRTVWR-482
# Conflicts:
# indra/newview/app_settings/shaders/class1/objects/previewV.glsl
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
|
2020-04-21 13:12:05 +03:00 |
|
Andrey Kleshchev
|
a8df6762ff
|
SL-13065 Fixed missing error and infinite cycle caused by too much logging
|
2020-04-17 19:24:55 +03:00 |
|
Andrey Kleshchev
|
884d5024a3
|
SL-13061 Fixed missing scroll handling
|
2020-04-17 17:19:55 +03:00 |
|
Andrey Kleshchev
|
3ab32456a0
|
SL-307 ImporterDebug is now logged into in-viewer log
|
2020-04-15 15:40:49 +03:00 |
|
Andrey Kleshchev
|
3c2f3edb5f
|
SL-379 Render selected joint yellow when Avatar tab is open
|
2020-03-31 15:40:48 +03:00 |
|
Andrey Kleshchev
|
aaddcc0b70
|
SL-307 A separator to see where model loading logs ends and other state starts
|
2020-03-30 20:06:34 +03:00 |
|
Andrey Kleshchev
|
acb6e12135
|
SL-379 Remake Overrides tab into Avatar
|
2020-03-30 19:42:46 +03:00 |
|
Andrey Kleshchev
|
46c76eabb8
|
SL-379 Do not disable tabs
|
2020-03-30 15:19:21 +03:00 |
|
Andrey Kleshchev
|
eaa9b152bf
|
SL-307 Implemented ability to specify color and changed flashing color
|
2020-03-27 22:38:15 +02:00 |
|
Dave Houlton
|
331f290f61
|
Merge master (v 6.3.9) into DRTVWR-440
|
2020-03-18 15:39:38 -06:00 |
|
Andrey Lihatskiy
|
9ec2aac56c
|
Merge branch 'master' into DRTVWR-482
|
2020-03-18 21:05:33 +02:00 |
|
Ptolemy
|
2b0b3e8625
|
SL-12781 Remove expensive and redundant z clear; instead enable/disable z test for background and model preview
|
2020-03-12 18:58:59 -07:00 |
|
Ptolemy
|
b67df8184f
|
SL-12781 Cleanup: Remove HACK / MAGIC NUMBER effective constant of mCameraDistance as it is set in setPreviewTarget() via initModelPreview()
|
2020-03-12 18:58:59 -07:00 |
|
Ptolemy
|
fe4549c950
|
SL-12781 Cleanup: Rename non-descript generic var name
|
2020-03-12 18:58:59 -07:00 |
|
Ptolemy
|
36499c7526
|
SL-12781 Cleanup: Update out-of-date color comment
|
2020-03-12 18:58:59 -07:00 |
|
Andrey Lihatskiy
|
75bd1bcd12
|
Merge branch 'master' into DRTVWR-482
|
2020-02-22 18:51:29 +02:00 |
|
Dave Houlton
|
7674c00fb9
|
Merge master (v 6.3.8) into DRTVWR-440
|
2020-02-21 12:05:46 -07:00 |