Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 1 | -15/+12 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml | ||||
| * | Fixed floatervicelicense not compiling with the new media changes | McCabe Maxsted | 2010-09-23 | 1 | -17/+14 |
| | | |||||
| * | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -2/+2 |
| | | |||||
* | | Fixed TOS loading and renamed corretly LLIamHere classes in TOS and Voice ↵ | elektrahesse | 2010-10-06 | 1 | -6/+6 |
|/ | | | | TOS respectively to LLIamHereTOS and LLIamHereVoice to avoid collisions. | ||||
* | Added vivox license window when enabling voice or starting up for the first ↵ | McCabe Maxsted | 2010-08-28 | 1 | -0/+237 |
time (voice can now be included from here on out :) |