summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Expand)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20merge with releaseRichard Linden
2013-06-14NORSPEC-266 fix issues with observer feedback on edits of material map parame...Graham Linden
2013-06-11NORSPEC-258 and NORSPEC-226 make tex picker close refresh build tool UI corre...Graham Madarasz
2013-06-05Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-06-05fix for SH-4227: interesting: long delay between root and child prim loading.Xiaohong Bao
2013-06-03NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculato...Dave Parks
2013-05-30SH-4147 FIX Macro avatar hover gets reset on relogNyx Linden
2013-05-29SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consist...Graham Madarasz
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 material...Graham Madarasz
2013-05-11Fix many issues with selection misapplication and rendering not matching appl...Graham Madarasz
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
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-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header depen...Richard 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-17for SH-4105: interesting: new viewer does not handle orphaned child prims in ...Xiaohong Bao
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-03NORSPEC-71 Lots more UI hookupsDave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22Automated merge with bundle:d:\code\viewer-interesting+c:\users\richard\appda...Richard Linden
2013-03-22merge with viewer-releaseRichard Linden
2013-03-18MergeXiaohong Bao
2013-03-13MAINT-2410 Extra Particle Parameters -- viewer implementationDave Parks
2013-03-11for SH-3979: interesting: can not edit objects with new object cache codeXiaohong Bao
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, hos...Brad Payne (Vir Linden)
2013-03-07for SH-3937: interesting: implement the new cache probe logicXiaohong Bao