phoenix-firestorm/indra
Loren Shih 2f2bdd83d6 For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089   svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

Infrastructure changes for cleaning up Asset/Folder types.  Associated sim changes are only so that the sim still compiles.
2009-11-03 00:47:23 +00:00
..
cmake DEV-41410 SNOW-204: merging this snowglobe fix into viewer-2.0.0-3. 2009-10-16 14:35:24 +00:00
copy_win_scripts
integration_tests Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. 2009-10-03 23:40:28 +00:00
lib/python
linux_crash_logger Merge a big bunch of fixes from maint-viewer. Hooray. 2009-10-14 10:40:56 +00:00
linux_updater linux updater fixes - use the same new standard substitution strings as the viewer. 2009-10-01 21:57:05 +00:00
llaudio Merge a big bunch of fixes from maint-viewer. Hooray. 2009-10-14 10:40:56 +00:00
llcharacter Code audit for r136515 ("merging in new wearable infrastructure...") 2009-10-21 21:37:27 +00:00
llcommon For QAR-2014 : Sandbox for testing FolderTypes [VIEWER] 2009-11-03 00:47:23 +00:00
llcrashlogger
llimage Merge a big bunch of fixes from maint-viewer. Hooray. 2009-10-14 10:40:56 +00:00
llimagej2coj
llinventory For QAR-2014 : Sandbox for testing FolderTypes [VIEWER] 2009-11-03 00:47:23 +00:00
llmath DEV-41080 more automated testing love - minor comment fixing. 2009-10-16 12:39:05 +00:00
llmessage For QAR-2014 : Sandbox for testing FolderTypes [VIEWER] 2009-11-03 00:47:23 +00:00
llplugin svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
llprimitive svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-10-16 21:41:31 +00:00
llrender improved metrics for llfontgl::getWidth (use greater of character width/xadvance) 2009-10-14 20:16:18 +00:00
llui Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry 2009-10-23 17:20:45 +00:00
llvfs merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: 2009-10-16 17:56:30 +00:00
llwindow Merge a big bunch of fixes from maint-viewer. Hooray. 2009-10-14 10:40:56 +00:00
llxml Backporting from hg branch @ 3495: Fix to integration test. 2009-10-19 22:31:47 +00:00
llxuixml removed unnecessary static variable instantiations to improve compile times 2009-10-20 22:05:00 +00:00
lscript svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 2009-10-01 02:35:53 +00:00
mac_crash_logger
mac_updater
media_plugins Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry 2009-10-21 04:58:23 +00:00
newview For QAR-2014 : Sandbox for testing FolderTypes [VIEWER] 2009-11-03 00:47:23 +00:00
test DEV-41408 convert lldependencies tut test to llcommon integration test. 2009-10-16 13:42:58 +00:00
test_apps/llplugintest
tools/vstool
win_crash_logger
win_updater
CMakeLists.txt
develop.py