aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterobjectiminfo.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| * Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-2/+2
| |
* | llmediaplugins first stepArmin Weatherwax2010-09-231-3/+3
|/
* Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-191-3/+30
|
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-0/+207