summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Expand)Author
2011-08-16MergePaul ProductEngine
2011-08-15SH-2029 FIX - fix for mac build error, hopefullyBrad Payne (Vir Linden)
2011-08-15SH-2029 FIX - persist the model name in SLMBrad Payne (Vir Linden)
2011-08-15MergePaul ProductEngine
2011-08-12merge from viewer-experienceLeyla Farazha
2011-08-11Added support for parsing of collada 1.4.1 location sidsprep linden
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-10SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline c...Dave Parks
2011-08-10Joint resolver now constructed from key name (cts-660)prep linden
2011-08-11SH-2064 FIXED 'Upload' button disabled while mesh upload is in progress.Seth ProductEngine
2011-08-09Reports error of a non compatible dae to the log if not 1.4prep linden
2011-08-09Temporarily disallow the upload of non 1.4 dae filesprep linden
2011-08-08mergeDave Parks
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-08-04SH-2201 Fix for crash when getting mesh estimates.Dave Parks
2011-07-29merging in PE's fixes for new UI to mesh-development.nyx
2011-07-27SH-1868 FIXED Rearranged the accounting info to leave enough room for the upl...Seth ProductEngine
2011-07-26SH-1086 Make physics shape display transparent and fix some z-fighting issues.Dave Parks
2011-07-25Fix for sh-2162prep
2011-07-25Partial fix for sh-1925.prep
2011-07-22SH-1868 WIP Added user-supplied metric data for uploading a model.seth_productengine
2011-07-20SH-715 Fix for bad "cancel" behavior in physics tab.Dave Parks
2011-07-18mergeDave Parks
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-15mergeBrad Payne (Vir Linden)
2011-07-14Fix for SH-2061 model crashes viewer - fixed an issue where a corrupted dae w...prep
2011-07-14Fix for Sh-2047: Partial joint arrays are now able to uploadprep
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-12mergeBrad Payne (Vir Linden)
2011-07-12SH-2043 FIXBrad Payne (Vir Linden)
2011-07-12mergeDave Parks
2011-07-12SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.Dave Parks
2011-07-11Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-07-10mergeDave Parks
2011-07-09Added L$ price breakdown for model uploadsDon Kjer
2011-07-09mergeDave Parks
2011-07-09SH-2007 Code cleanup, expand minimum header size to 4KB, better comments arou...Dave Parks
2011-07-09Fix for SH-2028. Also fixed layout issues with new upload warning and upload...Don Kjer
2011-07-07mergeDave Parks
2011-07-07SH-1774 Remove misleading "Debug" comment -- this code performs a function.Dave Parks
2011-07-07SH-1774 Fix for preserving material assignments between multiple custom LoDs.Dave Parks
2011-07-07Fix for SH-1992prep
2011-07-07Fixes for SH-1994 and SH-2009prep
2011-07-06SH-1972 Fix for slm messing up physics shape on second upload.Dave Parks
2011-07-06Fix for "set to default" button not resetting some data.Dave Parks
2011-07-06mergeBrad Payne (Vir Linden)
2011-07-06SH-1988 Fix for using diameter instead of radius for streaming cost.Dave Parks
2011-07-05mergeBrad Payne (Vir Linden)
2011-07-03SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 ...Don Kjer
2011-07-01Automated merge with https://bitbucket.org/seth_productengine/mesh-developmentNyx (Neal Orman)