summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-08-15merging latest viewer-mesh into nyx's sidebranchNyx (Neal Orman)
2011-08-11Added support for parsing of collada 1.4.1 location sidsprep linden
2011-08-10Fix for merge breakagesBrad Payne (Vir Linden)
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-10Submitted correction for logic error: if decomp fails for single hull only ↵prep linden
execute fallback code
2011-08-10Joint resolver now constructed from key name (cts-660)prep linden
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-09merge late beta fixes for storm-1060Oz Linden
2011-08-09merge changes for vwr-26458Oz Linden
2011-08-09merge changes for storm-1473Oz Linden
2011-08-09merge changes for storm-1436Oz Linden
2011-08-09merge changes for storm-1309Oz Linden
2011-08-09merge changes for storm-1540Oz Linden
2011-08-09merge changes for storm-1194Oz Linden
2011-08-08merge changes for storm-1060Oz Linden
2011-08-08more idiosyncracies for beta channelOz Linden
2011-08-08merge beta fix for storm-1060Oz Linden
2011-08-08fix idiosyncratic name for beta viewer channel icon recognitionOz Linden
2011-08-08correct xml syntax errorOz Linden
2011-08-08correct merge-induced error in settings.xmlOz Linden
2011-08-08merge back beta tagsOz Linden
2011-08-08merge changes for storm-1060Oz Linden
2011-08-05merged .hgtagsDebi King (Dessie)
2011-08-05undo Mac app name change (again)Oz Linden
2011-08-05Merging STORM-565Vadim ProductEngine
2011-08-05STORM-1540 FIXED Fixed missing and duplicated names in ↵Vadim ProductEngine
floater_build_options.xml and floater_model_wizard.xml.
2011-08-05undo Mac app name changeOz Linden
2011-08-05STORM-1309 WIP Fixed maturity rating icon overlapping the floater right border.Vadim ProductEngine
The code that places it now takes into account possible text truncation.
2011-08-05STORM-1309 WIP Proper truncation of region type, estate name and estate ↵Vadim ProductEngine
owner text. * Use ellipses for truncation. * Where applicable, set tooltip to contain the uncut text. * Leave a few pixels of padding between the text and the floater right border. LLView::getChild<T>() never returns NULL, so no need to check its return value.
2011-08-05STORM-1309 WIP Fixed timestamp (last modified date) value truncation.Vadim ProductEngine
2011-08-05STORM-1309 WIP Appended a space after the colon in "Last modified:".Vadim ProductEngine
It seems to have been mistakenly omitted by translators.
2011-08-04SH-2201 Fix for crash when getting mesh estimates.Dave Parks
2011-08-04storm-1060 : add windows (thanks Kadah and Michelle), remove some files I ↵Oz Linden
think are no longer used
2011-08-04merge changes for storm-1538Oz Linden
2011-08-04merge changes for storm-1355Oz Linden
2011-08-04merge changes for storm-1458Oz Linden
2011-08-04merge changes for storm-1291Oz Linden
2011-08-04fix path choice for project branches, attempt to fix linux iconOz Linden
2011-08-04merge back disabling of watchdogOz Linden
2011-08-04fix license headersOz Linden
2011-08-04fix DOS line endingsOz Linden
2011-08-04storm-1060 (partial) : update icon selection for Mac and Linux buildsOz Linden
2011-08-03Automated merge with file:///Users/oz/Work/V-PROz Linden
2011-08-02merge changes for storm-1535Oz Linden
2011-08-02disable watchdogOz Linden
2011-08-02Pull from richard/viewer-experienceMerov Linden
2011-08-02SH-2202 FIX physics costs have increasedNyx (Neal Orman)
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
2011-08-02Sync with lindenlab/viewer-developmentMerov Linden
2011-08-02pulling latest viewer-development into mesh merge branch.Nyx (Neal Orman)