andreykproductengine
2684c53690
Merge from viewer-relese and become version 3.8.1
2015-07-02 14:50:23 +03:00
Oz Linden
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
Mnikolenko ProductEngine
89321a56fd
increment viewer version to 3.7.29
2015-04-28 12:03:31 +03:00
simon
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
Oz Linden
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
ruslantproductengine
802302a31c
MAINT-3818 FIXED Certain dae files that used to display skin weights successfully now crash when ticking skin weights in model preview on ALL viewers
2015-03-26 18:05:47 +02:00
Oz Linden
23ec889631
changes to fix compiler warnings merged in from viewer-release
2015-01-13 14:54:35 -05:00
Oz Linden
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
maksymsproductengine
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
Oz Linden
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
ruslantproductengine
5c255726f4
MAINT-3488 FIXED Pose balls are sometimes invisible after standing up until zooming camera closer
2014-12-12 20:14:09 +02:00
callum_linden
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
Brad Payne (Vir Linden)
7e962d3798
merge
2014-12-08 13:01:44 -05:00
andreykproductengine
1cea21dcb9
MAINT-4700 FIXED Viewer cursor defaults to 'grab' mode when clicking on child prim of linkset that was recently physical and sat-upon
2014-12-01 19:31:09 +02:00
ruslantproductengine
b3c8a559f6
MAINT-3494 FIXED Generate Normals checkbox does not control generation of normals.
2014-11-28 18:17:54 +02:00
dolphin
62db156552
merged with 3.7.22-release
2014-12-05 13:22:07 -08:00
Graham Linden
a882d7a02b
Fix for gpu_bench crash without parallels knock-on
2014-11-18 12:54:13 -08:00
ruslantproductengine
c686407731
MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ALPHA_MODE_BLEND, do not render
...
MAINT-4645 FIXED [viewer-lion] The build tool shows normal or specular map as 'none' when one exists
2014-11-13 18:47:57 +02: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
callum_linden
d20c719f03
Update to build on Xcode 6.0: turn off warnings about unused functions from clang for tut package
2014-10-17 16:20:36 -07:00
dolphin
f9113c286f
Merge
2014-10-09 16:10:00 -07:00
Mnikolenko ProductEngine
d7db567f27
MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads
2014-10-09 17:30:59 +03:00
Mnikolenko ProductEngine
fa4fdedf51
MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploads
2014-10-09 13:10:16 +03:00
Richard Linden
e298325bed
MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue in llmanipscale.cpp
...
This was an out of bounds array access on a code path not normally accessed
To test, set debug setting ScaleShowAxes to true, go into build mode, and hold down Ctrl+Shift to scale an object
There should be colored bars along the scale axes, limited to the bounds of the object's extents
2014-09-23 19:12:35 -07:00
dolphin
d576e66210
Pulling over more lsl changes to support the adding of the LSL_XP_XXX constants
2014-08-06 13:49:29 -07:00
simon
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
Mnikolenko ProductEngine
c464a11958
MAINT-4123 FIXED return LLModel::BAD_ELEMENT for mesh with empty tex coords array
2014-06-06 11:44:58 +03:00
Ricky Curtice
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
simon
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
Oz Linden
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
Oz Linden
776aadf4ef
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
2014-03-19 17:30:07 -04:00
Dave Parks
27044252fc
MAINT-3661 Fix for crash when uploading corrupt .dae file.
2014-01-27 16:09:07 -06:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Richard Linden
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
Graham Linden
29216ac5e7
MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease.
2013-09-23 13:43:01 -07:00
Graham Linden
0e3ad3e94b
MAINT-3153 fix potential mis-indexing in DAE loading checks
2013-09-16 12:11:58 -07:00
Graham Linden
d38bcb6621
MAINT-2388 replace stomped fix to not crash when handed bogus model data
2013-09-16 09:40:58 -07:00
Xiaohong Bao
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
Graham Linden
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07:00
Richard Linden
d83c51a4e1
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 21:58:30 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
f87a49fad9
BUILDFIX: bad quotes
2013-07-31 11:49:34 -07:00
Richard Linden
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
Dave Parks
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
Dave Parks
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
Richard Linden
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
Dave Parks
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
Graham Linden
f782e01920
NORSPEC-267 fix UI feedback for materials edits not appearing for observers when obj was selected by them
2013-06-15 05:18:50 -07:00
Graham Madarasz
eba7eb2d06
NORSPEC-233 fix default value and material apply logic errors
2013-06-08 06:28:48 -07:00