aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Load prebuilt glib when needed. Don't compile gstreamer plugin on windows.Aleric Inglewood2010-10-274-10/+16
| | | | | | | | | | | | | | | | | | | | Also, darwin doesn't use quicktime, so disabled compiling that plugin for darwin.
| | * | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-271-1/+13
| | |\ \
| | | * | Remove the need for qglobal.h on non-standalone.Aleric Inglewood2010-10-271-1/+13
| | | | |
| | * | | Load mime_types_windows.xml instead of mime_types.xml so we can fallback on ↵McCabe Maxsted2010-10-272-3/+3
| | | | | | | | | | | | | | | | | | | | the version in the skins directory correctly
| | * | | Use quicktime instead of gstreamer on WindowsMcCabe Maxsted2010-10-271-14/+14
| | | | |
| | * | | Fixed mime_types.xml not being copied on Windows (also fixes plugin dll ↵McCabe Maxsted2010-10-271-13/+26
| | | | | | | | | | | | | | | | | | | | copying error)
| | * | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-2612-96/+98
| | |\ \ \ | | | |/ /
| | | * | Add missing skin thumbnail to artwork and move them to the right directory.Aleric Inglewood2010-10-261-24/+3
| | | | |
| | | * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-262-5/+11
| | | |\ \
| | | * \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-253-22/+34
| | | |\ \ \
| | | * \ \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-251-0/+8
| | | |\ \ \ \
| | | * | | | | Added missing textures to artwork.Aleric Inglewood2010-10-252-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed textures.xml by adding media_panel_scrollbg.png which is used in the MediaHUD as one of the media_*.png textures, but was lacking from textures.xml.
| | | * | | | | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-246-36/+35
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt Renamed RED --> IMP. Merged entries from both.
| | | * \ \ \ \ \ Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-231-9/+6
| | | |\ \ \ \ \ \
| | * | | | | | | | Fixed media plugin test not compilingMcCabe Maxsted2010-10-261-4/+33
| | | | | | | | | |
| | * | | | | | | | Set LL_GSTREAMER010_ENABLED to true for Linux-only until gstreamer loading ↵McCabe Maxsted2010-10-263-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be sorted on windows
| | * | | | | | | | Merge remote branch 'origin/webkit_plugins' into webkit_pluginsMcCabe Maxsted2010-10-23136-2587/+5006
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Fix the errors "QCursor: Cannot create bitmap cursor; invalid bitmap(s)" at ↵Aleric Inglewood2010-10-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start up of the webkit plugin. These are caused because builtin resources of QtWebKit weren't initialized.
| | | * | | | | | | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-22134-2554/+4974
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | * | | | | | | | LindenUserDir fixes, part 2.Aleric Inglewood2010-10-223-33/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the previous commit, the menu text - after logging in - had disappeared. This fixes that.
| | * | | | | | | | | Fixed copy_win_libs by removing glib dllsMcCabe Maxsted2010-10-231-8/+0
| | |/ / / / / / / /
| | * | | | | | | | Add support for PluginAttachDebuggerToPlugins for linuxAleric Inglewood2010-10-212-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opens a terminal with a gdb session for newly started SLPlugin processes if PluginAttachDebuggerToPlugins is set to TRUE.
| | * | | | | | | | LindenUserDir fixes.Aleric Inglewood2010-10-2013-50/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LindenUserDir (~/.imprudence/first_last/) cannot be initialized before the user logged in. However, several singletons (that only can be initialized once) depend on this directory for initialization. Therefore we have to take care not to instantiate those singletons until after the user logged in. With regard to webit, this fixes the browser_profile (cache and cookies) directory that the builtin browser uses.
| | * | | | | | | | Update WebKit Version in About floater.Aleric Inglewood2010-10-191-1/+1
| | | | | | | | | |
| | * | | | | | | | Sync LLViewerMediaImpl::newSourceFromMediaType with SG2Aleric Inglewood2010-10-193-16/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also renamed CookiesEnabled to BrowswerCookiesEnabled. Added BrowserJavascriptEnabled, BrowserPluginsEnabled and PluginAttachDebuggerToPlugins.
| | * | | | | | | | Forgot QtWebKit and Qt plugins in last commit.Aleric Inglewood2010-10-181-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 Inglewood2010-10-171-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.txtAleric Inglewood2010-10-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it find llqtwebkit.h with --standalone.
| | * | | | | | | | Fix windows mime types and gstreamer plugin name.Aleric Inglewood2010-10-163-486/+8
| | | | | | | | | |
| | * | | | | | | | Rename LLRect::isNull to LLRect::isEmpty (a random thing I picked up from ↵Aleric Inglewood2010-10-155-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | snowglobe 2.x).
| | * | | | | | | | Comment out code to make it compile at all (with the latest llqtwebkit).Aleric Inglewood2010-10-152-0/+11
| | | | | | | | | |
| | * | | | | | | | Add missing semi-colon.Aleric Inglewood2010-10-151-1/+1
| | | | | | | | | |
| | * | | | | | | | RED-595: Manual merge with weekly-webkit.Aleric Inglewood2010-10-1513-124/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plus some white space fixes (TABs --> spaces) in install.xml.
| | * | | | | | | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-10209-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_mergeRobin Cornelius2010-10-10530-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.hArmin Weatherwax2010-10-101-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Force mime_types.xml to use gstreamer as defaultRobin Cornelius2010-10-102-37/+37
| | | | | | | | | | |
| | | * | | | | | | | Let the gstreamer plugin build on windowsRobin Cornelius2010-10-105-14/+67
| | | | | | | | | | |
| | | * | | | | | | | one more poke on trees+grass + fix the windlight waterArmin Weatherwax2010-09-234-5/+10
| | | | | | | | | | |
| | | * | | | | | | | fix: cached trees + grass white on opensimArmin Weatherwax2010-09-233-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues remaining: windlight water is "flat"
| | | * | | | | | | | fix minimap surface not renderedArmin Weatherwax2010-09-231-1/+1
| | | | | | | | | | |
| | | * | | | | | | | fix conversion that is ambiguous for linux64 gcc; introduced in 11e4c300Armin Weatherwax2010-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maybe squash with 11e4c300
| | | * | | | | | | | linux* kill imprudence gstreamer, use system gstreamer instead.Armin Weatherwax2010-09-239-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 Weatherwax2010-09-2312-584/+440
| | | | | | | | | | |
| | | * | | | | | | | Fixed plugin compile issues on windowsMcCabe Maxsted2010-09-232-1/+2
| | | | | | | | | | |
| | | * | | | | | | | Removed more unused 'prepare' dependenciesMcCabe Maxsted2010-09-232-2/+0
| | | | | | | | | | |
| | | * | | | | | | | fix platform specific mime_type xml loadingArmin Weatherwax2010-09-232-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 Weatherwax2010-09-2328-162/+2445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loading. Issue: llqtwebkit needs update for Linux 64bit
| | | * | | | | | | | fix some mime type issuesArmin Weatherwax2010-09-234-45/+139
| | | | | | | | | | |
| | | * | | | | | | | fix "about land" (actually llpanellandmedia) crashesArmin Weatherwax2010-09-232-189/+132
| | | | | | | | | | |
generated by cgit v1.1 at 2025-03-15 14:33:59 +0000