aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/floatervoicelicense.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-101-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 changesMcCabe Maxsted2010-09-231-17/+14
| |
| * llmediaplugins first stepArmin Weatherwax2010-09-231-2/+2
| |
* | Fixed TOS loading and renamed corretly LLIamHere classes in TOS and Voice ↵elektrahesse2010-10-061-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 Maxsted2010-08-281-0/+237
time (voice can now be included from here on out :)