summaryrefslogtreecommitdiff
path: root/indra/newview/llresourcedata.h
AgeCommit message (Expand)Author
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer