aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | 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
| | | | | | | | | | |
| | | * | | | | | | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-23210-2270/+12699
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture system
| | | * | | | | | | | Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-239-1/+62
| | | | | | | | | | |
| | | * | | | | | | | update llplugin to latest version of SG2, pull latest webkitArmin Weatherwax2010-09-2322-64/+132
| | | | | | | | | | |
| | | * | | | | | | | update to latest SG2 media_pluginsArmin Weatherwax2010-09-2320-229/+956
| | | | | | | | | | |
| | | * | | | | | | | make it compile and run.Armin Weatherwax2010-09-233-147/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: llpanellandmedia.cpp and llviewermedia.cpp need a proper fix
| | | * | | | | | | | port llprimitive from SG2.0Armin Weatherwax2010-09-2320-335/+3121
| | | | | | | | | | |
| | | * | | | | | | | port SG2.0 Mediaplugs (webkit supports flash now)Armin Weatherwax2010-09-2350-221/+520
| | | | | | | | | | |
| | | * | | | | | | | remove deprecated filesArmin Weatherwax2010-09-233-1394/+0
| | | | | | | | | | |
| | | * | | | | | | | Fixed 'there is no media type for text/html' errorsMcCabe Maxsted2010-09-232-0/+469
| | | | | | | | | | |
| | | * | | | | | | | Fixed floatervicelicense not compiling with the new media changesMcCabe Maxsted2010-09-235-27/+24
| | | | | | | | | | |
| | | * | | | | | | | Fixed llvewermedia version info (and kept it disabled unless there's a good ↵McCabe Maxsted2010-09-231-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason for enabling it)
| | | * | | | | | | | Added fix for word size from Snowglobe (only for Windows--didn't update ↵McCabe Maxsted2010-09-237-8/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux or Mac as I can't test them)
| | | * | | | | | | | Removed some bad merge entries from newview/CMakeLists.txtMcCabe Maxsted2010-09-231-2/+0
| | | | | | | | | | |
| | | * | | | | | | | CMake now runs correctly on WindowsMcCabe Maxsted2010-09-232-0/+24
| | | | | | | | | | |
| | | * | | | | | | | Added missing plugins notificationsMcCabe Maxsted2010-09-231-0/+18
| | | | | | | | | | |
| | | * | | | | | | | Removed 'prepare' dependency from cmakeMcCabe Maxsted2010-09-233-3/+0
| | | | | | | | | | |
| | | * | | | | | | | Removed gstreamer and gstreamer-plugins from install.xml for WindowsMcCabe Maxsted2010-09-231-14/+0
| | | | | | | | | | |
| | | * | | | | | | | Fixed CopyWinLibs. Still a bunch of CMake errors and plugins don't load on ↵McCabe Maxsted2010-09-232-386/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows
generated by cgit v1.1 at 2025-03-15 16:00:25 +0000