aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Rename hippo* files to lower case (PART 1 OF 2)Aleric Inglewood2010-11-058-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a problem with #include "hippolimits.h" because the file is called hippoLimits.h (with an uppercase L). After some discussion on IRC it was reluctantly decided that filenames should be lowercase, as is done for every Linden file. Moreover, hippolimits.h is about the class HippoLimits, with uppercase H, so even that doesn't match. Of course, then we immediately rename all hippo* files to lowercase. This patch ONLY renames the file, with no other changes. This is done in order to make sure that git won't get confused ;). All other necessary changes will be in the next commit.
| * | Applied patch by Ansariel Hiller for #675: Keywords update to reflect ↵McCabe Maxsted2010-11-052-1/+5
| | | | | | | | | | | | changes to llSensor LSL function
| * | Applied patch by Nicky Perian for #680: commented out unused references to ↵McCabe Maxsted2010-11-051-54/+55
| | | | | | | | | | | | gstreamer post-webkit_plugins in viewer_manifest.py
| * | Fixed missing UseLocalChatWithBubbles control introduced in af6877fb (#685), ↵McCabe Maxsted2010-11-051-0/+11
| |/ | | | | | | patch by Nicky Perian
* | Bug #681: About Land->Audio doesn't do anythingthickbrick2010-11-062-5/+5
|/ | | | | | Uncomment the code needed for this panel to work. This was commented out in the inital Snowglobe media plugings merge, and somehow we got that too.
* Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-02356-10450/+34789
|\ | | | | | | browser/media plugin support
| * Uploaded the linux64 libraries created by Aleric to imprudenceviewer.orgMcCabe Maxsted2010-11-021-4/+4
| |
| * Fixed streaming video on Windows by updating mime_types_window.xml to the ↵McCabe Maxsted2010-11-021-6/+39
| | | | | | | | version used in Viewer 2
| * Deleted OPENAL.cmake.imp fileMcCabe Maxsted2010-11-021-115/+0
| |
| * Added missing qtxmlpatterns4.dll to CopyWinLibs.cmakeMcCabe Maxsted2010-11-021-0/+4
| |
| * Add headers from libdbus-1-dev_1.2.1-5+lenny1_i386.deb to dbusglib linux 32 ↵Aleric Inglewood2010-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bit package. The dbusglib package contains headers from both, libdbus-1 as well as libdbus-glib-1, but only the shared object file of the latter. This isn't entirely consistent with how we do this for other packages that we want to use the system provided ones for: then we link against prebuilts, but just don't install them. However, if that is working then it's very likely that this method will work too for a C library, so I guess it's ok like this. This package now contains the shared library from libdbus-glib-1-2_0.76-1_i386.deb (plus symlinks) and the headers from libdbus-glib-1-dev_0.76-1_i386.deb AND libdbus-1-dev_1.2.1-5+lenny1_i386.deb.
| * Install qtxmlpatterns4.dll on windows.Aleric Inglewood2010-11-021-0/+1
| |
| * Fix llqtwebkit version incompatibility.Aleric Inglewood2010-11-023-42/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch has the minimum changes needed to be compatible with LLQTWEBKIT_API_VERSION 2. From llqtwebkit.h: Version 2: indra/media_plugins/webkit/media_plugin_webkit.cpp: * Changed the usage of the event parameters in onClickLinkHref and onClickLinkNoFollow events slightly. The clicked URI for both should now be retrieved with getEventUri() instead of getStringValue(). The "target" string in onClickLinkHref is now retrieved with getStringValue() instead of getStringValue2(). * The contents of getStringValue2() in the onClickLinkHref event is now a unique ID for the window proxy the click targets. all changed files: * Removed the "link target type" concept, since it doesn't really belong here. Note that not all changes have been taken into account, since we need a LOT of code changes for MoaP before that gets relevant; most notably: "target" and "uuid" aren't used anywhere. The new LLEmbeddedBrowserWindowObserver::onWindowGeometryChangeRequested and LLEmbeddedBrowserWindowObserver::onRequestFilePicker are still not implemented. Version 1 introduced LLEmbeddedBrowserWindowObserver::onWindowCloseRequested which is also still not implemented.
| * Make LLStringUtilBase<T>::null a constant.Aleric Inglewood2010-11-023-4/+4
| |
| * Delete piece of code that is redundant.Aleric Inglewood2010-11-021-8/+0
| |
| * RED-595 was renamed to IMP-595Aleric Inglewood2010-11-021-1/+1
| |
| * Added conversion function for plugin EState to string infoMcCabe Maxsted2010-11-022-1/+52
| |
| * Remove explicit dependency of windows on media_plugin_gstreamer010Aleric Inglewood2010-10-281-1/+1
| |
| * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-2847-161/+1149
| |\
| * | Only initialize WebCore resource(s) on linux.Aleric Inglewood2010-10-281-7/+8
| | | | | | | | | | | | | | | | | | | | | I searched the darwin and windows llqtwebkit tarballs and neither qInitResources_WebCore nor qInitResources_WebCore_QT_NAMESPACE exist in there... No idea why, but then we can't call it to initialize it now can we?
| * | 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).
generated by cgit v1.1 at 2024-11-16 00:27:53 +0000