89321a56fd
increment viewer version to 3.7.29
2015-04-28 12:03:31 +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
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
cecad67163
merge
2013-10-16 17:56:48 -04:00
1f8b37e9ad
merge
2013-10-16 11:52:43 -04:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
ff8b002c3b
Quite down log spam from loading shaders.
...
Up bone cap to 64 for rigged meshes.
2013-10-10 13:56:06 -05:00
Mnikolenko ProductEngine