aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmediactrl.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-2/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * remove llfloaterhtml.* (not used anymore).Armin Weatherwax2011-03-011-1/+0
| |
| * fix news bar doesn't open internal browserArmin Weatherwax2011-03-011-1/+6
| |
* | Unbranding word of the day is "Second Life".David Seikel2011-02-261-1/+1
| |
* | Unbranding. Todays word is "linden".David Seikel2011-02-251-1/+1
|/
* RED-595 was renamed to IMP-595Aleric Inglewood2010-11-021-1/+1
|
* RED-595: Manual merge with weekly-webkit.Aleric Inglewood2010-10-151-1/+2
| | | | Plus some white space fixes (TABs --> spaces) in install.xml.
* Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-1/+2
| | | | | | | | | | | | | | Viewer 2 texture system" This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d. Conflicts: linden/indra/newview/llsurface.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h
* port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-2/+1
| | | | texture system
* llmediaplugins first stepArmin Weatherwax2010-09-231-0/+1201