| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | | | Forgot QtWebKit and Qt plugins in last commit. | Aleric Inglewood | 2010-10-18 | 1 | -2/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standalone now works (I have no idea why it worked before, since obviously I tested it before committing the previous commit). | |||||
| | * | | | | | | | | Find Qt4 with find_package on STANDALONE. | Aleric Inglewood | 2010-10-17 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Qt is found in a non-standard place, you still have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running imprudence of course (or the webkit plugin will silently fail). | |||||
| | * | | | | | | | | Add LLQTWEBKIT_INCLUDE_DIR to indra/llplugin/CMakeLists.txt | Aleric Inglewood | 2010-10-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it find llqtwebkit.h with --standalone. | |||||
| | * | | | | | | | | Fix windows mime types and gstreamer plugin name. | Aleric Inglewood | 2010-10-16 | 3 | -486/+8 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up from ↵ | Aleric Inglewood | 2010-10-15 | 5 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snowglobe 2.x). | |||||
| | * | | | | | | | | Comment out code to make it compile at all (with the latest llqtwebkit). | Aleric Inglewood | 2010-10-15 | 2 | -0/+11 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Add missing semi-colon. | Aleric Inglewood | 2010-10-15 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | RED-595: Manual merge with weekly-webkit. | Aleric Inglewood | 2010-10-15 | 13 | -124/+132 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml. | |||||
| | * | | | | | | | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵ | Robin Cornelius | 2010-10-10 | 209 | -12426/+2000 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | | | | | | | Merge branch 'mccabe-plugins' into plugins_merge | Robin Cornelius | 2010-10-10 | 530 | -12227/+47350 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | | | | | Thickbrick Sleaford, Soft Linden: STORM-164 make gcc-4.4 happy about llvosky.h | Armin Weatherwax | 2010-10-10 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Force mime_types.xml to use gstreamer as default | Robin Cornelius | 2010-10-10 | 2 | -37/+37 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Let the gstreamer plugin build on windows | Robin Cornelius | 2010-10-10 | 5 | -14/+67 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | one more poke on trees+grass + fix the windlight water | Armin Weatherwax | 2010-09-23 | 4 | -5/+10 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix: cached trees + grass white on opensim | Armin Weatherwax | 2010-09-23 | 3 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues remaining: windlight water is "flat" | |||||
| | | * | | | | | | | | fix minimap surface not rendered | Armin Weatherwax | 2010-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix conversion that is ambiguous for linux64 gcc; introduced in 11e4c300 | Armin Weatherwax | 2010-09-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maybe squash with 11e4c300 | |||||
| | | * | | | | | | | | linux* kill imprudence gstreamer, use system gstreamer instead. | Armin Weatherwax | 2010-09-23 | 9 | -3589/+143 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | who ever builds a release with that needs to consider to install some really old gstreamer at /usr/local/lib - lenny has 0.10.19 | |||||
| | | * | | | | | | | | Imprudence style gstreamer plugin (remove llgst, syms and such) | Armin Weatherwax | 2010-09-23 | 12 | -584/+440 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed plugin compile issues on windows | McCabe Maxsted | 2010-09-23 | 2 | -1/+2 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Removed more unused 'prepare' dependencies | McCabe Maxsted | 2010-09-23 | 2 | -2/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix platform specific mime_type xml loading | Armin Weatherwax | 2010-09-23 | 2 | -15/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note: mime_type<_nonwindowsplatform>.xml directs SLPlugin to the actual implementation. For using gstreamer on mac + win the file has to be changed (try the linux one :) ) | |||||
| | | * | | | | | | | | update to viewer-external SLPlugin + webkit. Fixes (lots of) webpages not ↵ | Armin Weatherwax | 2010-09-23 | 28 | -162/+2445 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit | |||||
| | | * | | | | | | | | fix some mime type issues | Armin Weatherwax | 2010-09-23 | 4 | -45/+139 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | fix "about land" (actually llpanellandmedia) crashes | Armin Weatherwax | 2010-09-23 | 2 | -189/+132 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵ | Armin Weatherwax | 2010-09-23 | 210 | -2270/+12699 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture system | |||||
| | | * | | | | | | | | Robin Cornelius: fixes for building plugins on Linux 64bit | Armin Weatherwax | 2010-09-23 | 9 | -1/+62 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | update llplugin to latest version of SG2, pull latest webkit | Armin Weatherwax | 2010-09-23 | 22 | -64/+132 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | update to latest SG2 media_plugins | Armin Weatherwax | 2010-09-23 | 20 | -229/+956 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | make it compile and run. | Armin Weatherwax | 2010-09-23 | 3 | -147/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: llpanellandmedia.cpp and llviewermedia.cpp need a proper fix | |||||
| | | * | | | | | | | | port llprimitive from SG2.0 | Armin Weatherwax | 2010-09-23 | 20 | -335/+3121 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | port SG2.0 Mediaplugs (webkit supports flash now) | Armin Weatherwax | 2010-09-23 | 50 | -221/+520 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | remove deprecated files | Armin Weatherwax | 2010-09-23 | 3 | -1394/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed 'there is no media type for text/html' errors | McCabe Maxsted | 2010-09-23 | 2 | -0/+469 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed floatervicelicense not compiling with the new media changes | McCabe Maxsted | 2010-09-23 | 5 | -27/+24 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed llvewermedia version info (and kept it disabled unless there's a good ↵ | McCabe Maxsted | 2010-09-23 | 1 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason for enabling it) | |||||
| | | * | | | | | | | | Added fix for word size from Snowglobe (only for Windows--didn't update ↵ | McCabe Maxsted | 2010-09-23 | 7 | -8/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux or Mac as I can't test them) | |||||
| | | * | | | | | | | | Removed some bad merge entries from newview/CMakeLists.txt | McCabe Maxsted | 2010-09-23 | 1 | -2/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | CMake now runs correctly on Windows | McCabe Maxsted | 2010-09-23 | 2 | -0/+24 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Added missing plugins notifications | McCabe Maxsted | 2010-09-23 | 1 | -0/+18 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Removed 'prepare' dependency from cmake | McCabe Maxsted | 2010-09-23 | 3 | -3/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Removed gstreamer and gstreamer-plugins from install.xml for Windows | McCabe Maxsted | 2010-09-23 | 1 | -14/+0 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed CopyWinLibs. Still a bunch of CMake errors and plugins don't load on ↵ | McCabe Maxsted | 2010-09-23 | 2 | -386/+173 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows | |||||
| | | * | | | | | | | | Fixed Windows compile error with WIND_BUFFER_SIZE_SEC | McCabe Maxsted | 2010-09-23 | 2 | -1/+2 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed newview\CMakeLists.txt not parsing on Windows | McCabe Maxsted | 2010-09-23 | 1 | -5/+4 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Added missing glui and freeglut libs on Windows | McCabe Maxsted | 2010-09-23 | 1 | -0/+37 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | First LL update of plugins, mainly documentation | Armin Weatherwax | 2010-09-23 | 10 | -103/+358 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | lost in merge: 1 debug setting, some member variables from llpanellandmedia | Armin Weatherwax | 2010-09-23 | 3 | -20/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | todo: review llpanellandmedia; port flotervoicelicense | |||||
| | | * | | | | | | | | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 305 | -7793/+30690 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Use all those cores for compile | Robin Cornelius | 2010-10-09 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
 |
index : meta-impy | |
| Metaverse (OpenSim/SL) viewer with an emphasis on usability. My attempt to keep up with 1.4 impy development. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |