summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-12MergeDon Kjer
2011-07-12Changes to support SH-1894: Textures uploaded with Mesh do not appear in ↵Don Kjer
inventory. Reviewed by Andrew
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12fix for SH-2040: Missing '?: 0' and old style object/prim counts under Edit ↵Xiaohong Bao
linked when Mesh disabled
2011-07-12mergeDave Parks
2011-07-12SH-2050 Hide UI that breaks down upload fee and rename some fields.Dave Parks
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12mergeBrad Payne (Vir Linden)
2011-07-12SH-2049 FIXBrad 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-12SH-2052 Fix for reported PE being too low when selecting more than 500 objects.Dave Parks
2011-07-11fix for SH-2051: viewer crashes when try to disbable "Show Upload Cost"Xiaohong Bao
2011-07-11Fix for sh-1982 and sh-2025prep
2011-07-11mergeprep
2011-07-11SH-2012: removed upload wizard from inventory '+' menuprep
2011-07-11mergeBrad Payne (Vir Linden)
2011-07-11Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-07-11mergeBrad 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 ↵Dave Parks
around magic numbers, remove dead calcResourceCost
2011-07-09MergeDon Kjer
2011-07-09Fix for SH-2028. Also fixed layout issues with new upload warning and ↵Don Kjer
upload price text when floater is resized.
2011-07-09mergeBrad Payne (Vir Linden)
2011-07-09increment version to 2.8.0Oz Linden
2011-07-08SH-2007 Don't eat an entire core when uploading meshes or requesting fee ↵Dave Parks
information.
2011-07-08mergeDave Parks
2011-07-08SH-2008 Fix for crash when generating normals on objects with no texture ↵Dave Parks
coordinates.
2011-07-08merge changes for storm-1491Oz Linden
2011-07-08Merge viewer-development -> mesh-developmentDon Kjer
2011-07-08Merge viewer-development -> mesh-developmentDon Kjer
2011-07-08merge changes for storm-1489Oz Linden
2011-07-08ER-910 cleanup: removed a stale comment, tweaked text in About Land dialogsimon@lindenlab.com
Options tab.
2011-07-08EXP-990 FIX Cannot select from Texture picker for Groups profile picRichard Linden
reviewed by Leslie
2011-07-08Fix for sh-1637 and sh-1638prep linden
2011-07-08Fix for sh-2016 Removed extra charprep linden
2011-07-08Fix for sh-2016prep linden
2011-07-08merge changes for storm-1484Oz Linden
2011-07-08merge changes for vwr-25753Oz Linden
2011-07-08EXP-983 FIX -- Viewer crashes around Place Profile and Landmarks listing in ↵Leslie Linden
Viewer Experience Drag and drop for LLFolderView now handles the empty mFolders case.
2011-07-08merge changes for storm-1462Oz Linden
2011-07-08Disabling outbox panel display logic for the time being.Leslie Linden
2011-07-08Fix for sh-2012 removed upload wizard optionprep linden
2011-07-08merge changes for storm-1485Oz Linden
2011-07-07Merge latest from viewer trunksimon@lindenlab.com
2011-07-07Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"simon@lindenlab.com
and muck with the "About Land" Options tab one more time.