325c076d09
MAINT-7213 Shared media (media as a texture) unusable with transparent mesh
...
New outline selection around mesh objects.
2017-10-26 18:33:08 +03:00
8c03881193
Merged in lindenlab/viewer-lynx
2017-11-22 16:44:36 +02:00
8da9e0ffd7
MAINT-72 unmapBuffer crash
2017-11-17 17:33:10 +02:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
d1ab470542
DRTVWR-418: Fix C++ errors detected by Xcode 9.
...
You can't legitimately perform an ordered comparison between a pointer and an
int, even 0. Fix a number of 'if (ptr > 0)' to plain 'if (ptr)'.
Fix LLEditWearableDictionary::WearableEntry constructor to avoid varargs
mechanism. It used to accept three different counts, followed by three
different lists of enums, fetched in each case as 'int' -- dubious in itself.
The constructor body performed three different loops to populate those enums
into three different member vectors.
Instead, make the constructor accept three vectors and initialize the member
vectors from the passed vectors. Now that C++ has inline vector
initialization, change existing constructor calls to pass temporary vectors
initialized with what used to be the varargs enum values.
2017-09-20 16:58:58 -04:00
0e9fb587fa
MAINT-7813 - 3D rendering broken on Windows in build 508618. 3D rendering starts before 2D login screen is cleared.
...
FIXED
2017-09-18 21:02:53 +03:00
6883c6b1f6
replace a 'continue' with an 'else'
2017-09-14 16:56:51 -04:00
46dc097516
MAINT-7129 - [Project Alex Ivy][MAC] Materials and ALM shaders broken in Mac viewer
...
FIXED
2017-09-14 16:39:01 +03:00
01e0b78c59
merge changes for DRTVWR-439
2017-08-16 15:43:58 -04:00
cf865bb596
MAINT-7652 Fix for crash in LLVertexBuffer::~LLVertexBuffer() destructor
2017-08-09 00:04:25 +03:00
f8254a9d78
MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder.
2017-08-30 19:57:02 +03:00
71269ac1fc
Backed out changeset: ebe10b4b1197
2016-12-15 02:40:51 +02:00
65161e6b39
MAINT-6125 - Mesh avatar deforms constantly
...
MAINT-6910 - [MAINT-RC] Some mesh turns invisible when camera is moved on the Maint-RC viewer only - caused by fix for MAINT-6125.
Commulative fix.
Fixed for booth ticket's in indra/newview/llvovolume.cpp
Remained fixed, it's a small code improvements which is not related to
MAINT-6125, MAINT-6910
2016-12-12 18:24:46 +02:00
5cc716dbf9
MAINT-6125 - Mesh avatar deforms constantly
...
MAINT-6910 - [MAINT-RC] Some mesh turns invisible when camera is moved on the Maint-RC viewer only - caused by fix for MAINT-6125.
Commulative fix.
Fixed for booth ticket's in indra/newview/llvovolume.cpp
Remained fixed, it's a small code improvements which is not related to
MAINT-6125, MAINT-6910
2016-12-12 18:24:46 +02:00
a65b586b18
MAINT-6729 Additional fix for crash in LLImageGL::analyzeAlpha()
2016-12-08 17:21:05 +02:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
7c5e92cec5
SL-644 Add guard to mCount in LLRender.cpp
2017-03-13 11:13:43 -07:00
37974a2fa2
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
2017-02-03 20:14:32 -05:00
434f0e161a
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-02-03 09:54:52 -05:00
c20e57c48f
move debugging globals to the "lowest" library they are referenced in
2016-12-20 14:41:46 -05:00
fd79bb9c7d
DRTVWR-418: Merge backout of TYPE_INDEX / TYPE_MAX change
2016-12-17 11:09:48 -05:00
4c95587dc3
Backed out changeset bb47510bda62: don't change TYPE_MAX.
...
Ruslan points out that changing TYPE_MAX could lead to extra (useless) render
passes. We will have to solve the TYPE_INDEX > TYPE_MAX problem another way.
2016-12-17 11:09:09 -05:00
1298961066
DRTVWR-418: Update dubious llvertexbuffer.cpp cast comment.
...
Ruslan assures me that in fact this usage is valid.
2016-12-17 11:07:20 -05:00
c1ae63a872
DRTVWR-418: Work around dubious cast from S32 to GLvoid*
...
when passing -- something -- to glVertexAttribPointerARB() in
LLVertexBuffer::setupVertexArray().
2016-12-16 19:08:24 -05:00
93268cb47a
DRTVWR-418: Put TYPE_INDEX within TYPE_MAX: stop undefined indexing.
...
LLVertexBuffer::TYPE_INDEX was past TYPE_MAX, which is used to set the maximum
sizes of various (scattered) arrays, bleh. The alarm bells that this SHOULD
set off are indeed correct: TYPE_INDEX was being used to index at least one of
those arrays, meaning we've been indexing past the end of that array, meaning
undefined behavior.
The enum that defines both TYPE_INDEX and TYPE_MAX provides a helpful comment
indicating what things must be updated when modifying the enum. (Far better to
define things centrally in a single place... but another time.) Update the
designated arrays to include a final TYPE_INDEX entry. Contents of those
entries are wild guesses -- but even wild guesses are better than completely
indeterminate data.
2016-12-16 17:03:45 -05:00
067468885a
BUG-41027 (FIX) Changing login location at the login screen crashes the viewer
2016-12-15 10:58:23 -08:00
05d58c91ef
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-12-05 17:01:38 -05:00
934b94e74a
DRTVWR-418: pull in new viewer-release via viewer64
2016-11-16 10:56:05 -05:00
3c9181867f
MAINT-6905 reducing log spam
2016-11-04 16:18:35 +02:00
a47896f4b9
Merged lindenlab/viewer-neko into default
2016-10-11 16:21:01 +03:00
4617e07b37
Merged in lindenlab/viewer-release
2016-10-10 23:26:58 +03:00
028fd67929
Crashfixes for image loading
2016-10-07 07:03:35 +03:00
a14b9cb604
MAINT-6635 Fix for LLImageGL::setSize crash
2016-10-07 03:52:04 +03:00
999dc6c61b
Merged lindenlab/viewer-neko into default
2016-09-27 15:43:53 +03:00
fe49126d45
MAINT-5011: Commit backing out BlockTimer warning suppression.
2016-09-06 20:42:27 -04:00
bfb400ccd7
Backed out changeset c30d8774c404: remove warning suppression
...
for possibly-uninitialized data member in BlockTimer::BlockTimer.
NickyD suggested a real fix.
2016-09-06 20:41:23 -04:00
a00165aad4
MAINT-6683 fixed wrapping issues of notecard embedded items
2016-08-30 20:13:45 +03:00
6b24122857
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
2016-08-29 17:06:12 -04:00
20cf275d21
MAINT-5011: Work around gcc 4.7.2 overly (?) picky fatal warning.
2016-08-29 18:51:32 +00:00
25c20f98a8
MAINT-5018 crashing when touching mesh
...
Fix #1 Disable FSAA for drawing selected objects (it help to avoid crash on
old ATI cards (in my case it's a HD3800)).
2016-08-05 17:21:22 +03:00
eebbda288d
Backed out changeset: 5fe5ad059c05
2016-07-18 20:09:18 +03:00
05fcb7c812
Automated merge with tip of viewer-release
2016-05-23 16:50:56 -07:00
1b5af4be29
Add invert texture coordinates for media textures.
2016-05-13 18:47:23 +03:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
c4e21cf282
Fix a crash is drawn vertices is 0.
...
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24 12:55:13 +02:00
48016ff54b
MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics Preferences for ATI Radeon HD 3800 Series graphics card
2016-04-12 19:29:35 +03:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
173886fec3
MAINT-1109 FIXED Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Patchset #2
2016-03-10 19:50:12 +02:00
511bf30a2e
make shader loading messages LL_DEBUGS
2016-03-07 15:40:39 -05:00
09cb792aa7
MAINT-5297 - icons were not removed from memory
2016-02-24 16:22:38 +02:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
c73d9e5c44
MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0
2015-12-29 20:20:40 +02:00
cbdf791fb1
MAINT-1109 Toggling graphics options causes viewer memory to increase, eventually causing the rendering pipeline to fall over and crashing the viewer
...
Te reason of memory leak - unloaded shaders.
Fixed.
2015-12-01 19:57:38 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
4f8f739a98
MAINT-3568 Mac OS X, ALM, Full Bright, Shininess
...
The reason of this bug the same as was in MAINT-4165, MAINT-4839.
I.e. in short: SL engine is sensitive to the uniform variable location.
2015-10-02 19:25:05 +03:00
bb87365c37
Merge viewer-release, become version 3.7.29
2015-04-28 13:36:35 +03:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
5c6cf3e7fb
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-10 11:02:37 -04:00
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
29bdf1a234
MAINT-4839 FIXED Animation of Mesh Dress doesn't work.
...
MAINT-4165 FIXED Crash on skinned, texture animated geometry with deferred rendering enabled.
2015-03-01 14:10:54 +02:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
23711c9275
Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013
2014-12-10 08:44:08 -08:00
7e962d3798
merge
2014-12-08 13:01:44 -05:00
c3e18bc537
Merge downstream code and become version 3.7.23
2014-12-08 11:52:17 -08:00
6cffbfba8b
merge
2014-12-02 14:48:45 -05:00
fe5ff3e74a
merge
2014-12-01 16:21:52 -05:00
0013a50353
merge changes for 3.7.21 release
2014-12-01 15:49:31 -05:00
fa068dffd0
Merge downstream code and become version 3.7.21
2014-11-24 11:31:06 -08:00
a882d7a02b
Fix for gpu_bench crash without parallels knock-on
2014-11-18 12:54:13 -08:00
de2fe42a52
Attempt wider disable of using profile API when timer query is not present
2014-11-17 14:54:00 -08:00
9eeb8344a6
Avoid using GL_ARB_timer_query functionality when not supported and protect against probably-not-NULL current bound shader pointer
2014-11-17 11:40:28 -08:00
6be2f0ba2b
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2014-11-14 08:49:08 -05:00
fa9097b65f
Merge changes for 3.7.20-release
2014-11-11 02:32:39 +02:00
b66c719060
merge changes for 3.7.20-release
2014-11-10 14:43:05 -05:00
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
2c78c1935f
Update to build on Xcode 6.0: more removal of unused variables [-Wunused-variable]
2014-10-17 15:45:18 -07:00
7ffa456683
STORM-2080: correct fitted mesh rendering on some ATI cards
2014-10-14 11:22:39 -04:00
5cb5c267ca
fixes for cmake warnings about policy changes. could not fully test these changes
2014-10-13 12:46:55 -07:00
d47efdfe03
MAINT-3964 FIXED Textures with Alpha won't Animate on Rigged Mesh when worn : fix in shader (mul texcoord to tex matrix), array's optimization
2014-09-10 21:08:08 +03:00
d0428575fb
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2014-06-19 13:14:42 -05:00
8392fde6f6
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
2014-06-02 22:32:16 +01:00
7b9708a2e3
sunshine-external merge WIP
2014-05-13 10:02:26 -04:00
c307bda68a
Correcting a build error with the release viewer.
2014-05-08 21:58:51 +01:00
f43e46bc9c
MAINT-4009: Ensuring that the pick mask for the LLImageGL is always properly freed during its cleanup method.
2014-04-28 19:44:02 +01:00
24f8745914
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
2014-03-19 17:57:00 -05:00
d9e3a2948a
merge
2014-03-12 17:24:07 -04:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
969cb45920
merge
2014-02-11 16:04:31 -05:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
4acc2dc273
Merge viewer-release
2014-02-10 15:42:25 -08:00
744cf6be8d
merge
2013-12-05 10:39:35 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
3c2b90514d
merge 3.6.10-release
2013-11-11 16:19:35 -05:00
c35801ef1c
fixed focus issue on inventory
2013-11-05 19:26:23 -08:00
b95935ccf3
Merge downstream code from viewer-bear
2013-10-30 11:25:08 -07:00
dfa6822b34
MAINT-3359 Don't check for LLGLSLShader::sNoFixedFunction as we don't want to loose ui colours(depending on enabled/disabled basic shader).
2013-10-30 14:26:11 +02:00
ruslantproductengine