summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Collapse)Author
2013-12-05mergeBrad Payne (Vir Linden)
2013-10-16mergeBrad Payne (Vir Linden)
2013-09-25SH-3455 WIP - moved setAvatarObject() to run after the self av constructor. ↵Brad Payne (Vir Linden)
Disabled sendAgentWearablesUpdate.
2013-09-18The unbearable lightness of being norspecGraham Linden
2013-08-16merge with viewer-releaseNyx Linden
2013-10-17SUN-69 MAINT-2258 : temp attachments getting removed improperly. Reviewed ↵simon
by Kelly.
2013-08-07NORSPEC-329 fix mangling of diffuse alpha mode by material edits when only ↵Graham Linden
one face really has alpha
2013-08-04NORSPEC-305 -NORSPEC-335 fix scale and HUD anim regression from materials ↵Graham Linden
changes in CL 28424
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-14NORSPEC-266 fix issues with observer feedback on edits of material map ↵Graham Linden
parameters
2013-06-11NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI ↵Graham Madarasz
correctly and fix issues with transition from no-bumps to normal maps
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent ↵Dave Parks
calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-05-30SH-4147 FIX Macro avatar hover gets reset on relogNyx Linden
Hover minimum enforcement was getting triggered on relog for macro avatars before the joint offsets were applied when loading the avatar. Added code to verify that all attachments in COF have been rezzed, and all attached objects are not in the process of being rebuilt to the enforcement code. This should verify that we only apply the hover value enforcement when all rigged meshes are actually loaded before enforcing minimum hover value
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using ↵Graham Madarasz
material instead of mMaterial
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-05-11merge latest integration repo changesOz Linden
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs ↵Graham Madarasz
(unneeded with FMODEX), make indra.l/y safe for bison >= 2.7
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09Mergesimon
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-30Merge downstream code from viewer-bearsimon
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
Added protection for invalid / empty inventory contents
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-03NORSPEC-71 Lots more UI hookupsDave Parks
Written with and Reviewed By Graham
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
Reviewed by Kelly and Graham
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-02-15fix crasher in setNumTEsOz Linden
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-04improve and clarify loggingOz Linden
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong ↵Brad Payne (Vir Linden)
place, avoid querying textures for which we have no authoritative data where they live