summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2015-06-08merge changes for 3.7.29-releaseOz Linden
2015-04-15Merge viewer-releasesimon
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-01-13changes to fix compiler warnings merged in from viewer-releaseOz Linden
2015-01-13merge changes for 3.7.24-releaseOz Linden
2014-12-19merge with 3.7.23-releasemaksymsproductengine
2014-12-15merge changes for 3.7.22-releaseOz Linden
2014-12-12MAINT-3488 FIXED Pose balls are sometimes invisible after standing up until ↵ruslantproductengine
zooming camera closer
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-12-08mergeBrad Payne (Vir Linden)
2014-12-01MAINT-4700 FIXED Viewer cursor defaults to 'grab' mode when clicking on ↵andreykproductengine
child prim of linkset that was recently physical and sat-upon
2014-11-28MAINT-3494 FIXED Generate Normals checkbox does not control generation of ↵ruslantproductengine
normals.
2014-12-05merged with 3.7.22-releasedolphin
2014-11-18Fix for gpu_bench crash without parallels knock-onGraham Linden
2014-11-13MAINT-4092 FIXED Prim faces with opaque diffuse maps, with material set to ↵ruslantproductengine
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-03MAINT-3585 FIXED Viewer Crashes when attempting to upload image.ruslantproductengine
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-10-17Update to build on Xcode 6.0: turn off warnings about unused functions from ↵callum_linden
clang for tut package
2014-10-09Mergedolphin
2014-10-09MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploadsMnikolenko ProductEngine
2014-10-09MAINT-4545 FIXED simplebot.dae rigged mesh no longer uploadsMnikolenko ProductEngine
2014-09-23MAINT-4481 FIX [viewer-lion] Linux build fails due array-bounds issue in ↵Richard Linden
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-08-06Pulling over more lsl changes to support the adding of the LSL_XP_XXX constantsdolphin
2014-07-07Merge downstream code and become 3.7.12simon
2014-06-06MAINT-4123 FIXED return LLModel::BAD_ELEMENT for mesh with empty tex coords ↵Mnikolenko ProductEngine
array
2014-06-05MergeRicky Curtice
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-03-19OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBSOz Linden
2014-01-27MAINT-3661 Fix for crash when uploading corrupt .dae file.Dave Parks
2013-10-08merge from viewer-releaseRichard Linden
2013-10-01Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-23MAINT-3179 fix bad indexing of position info generating false alarms on ↵Graham Linden
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-16MAINT-3153 fix potential mis-indexing in DAE loading checksGraham Linden
2013-09-16MAINT-2388 replace stomped fix to not crash when handed bogus model dataGraham Linden
2013-08-19MergeXiaohong Bao
2013-08-19Merge in viewer-releaseGraham Linden
2013-08-14BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macrosRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-31BUILDFIX: bad quotesRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
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-19BUILDFIX: #include and dependency cleanupRichard Linden
2013-06-27Automated merge with ↵Dave Parks
https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-15NORSPEC-267 fix UI feedback for materials edits not appearing for observers ↵Graham Linden
when obj was selected by them
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and ↵Graham Madarasz
make scale accessors get with the program
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-06-05merge with viewer-releaseRichard Linden