aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\
| | * IMP-670: Uninstall packages that are renewedAleric Inglewood2010-10-262-5/+11
| | | | | | | | | | | | | | | Uninstall old files when a new package with the same name is being installed. See http://redmine.imprudenceviewer.org/issues/670
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-253-22/+34
| |\ \ | | |/
| | * IMP-667: WARNING: remove: Attempting to remove filename: ↵Aleric Inglewood2010-10-252-1/+10
| | | | | | | | | | | | | | | | | | | | | /ramdisk/imprudence/cache/textures/*/*.texture This turned out to be a simple matter of trying to remove non-existant files: A texture with a 'body size' of 0 doesn't have a texture body file.
| | * Fixed a locking issue with regard to texture cache purging.Aleric Inglewood2010-10-252-7/+14
| | | | | | | | | | | | Releasing a lock in the middle of a critical area isn't very smart.
| | * Fix possible crash on llassert_always(purge_list.size() >= entries_to_purge)Aleric Inglewood2010-10-251-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This horrible noobish code checked if num_entries > sCacheMaxEntries and then goes on to assign (num_entries-empty_entries) - sCacheMaxEntries to an U32 entries_to_purge. Obviously this can lead to an abitrary large value of entries_to_purge with as result a crash due to the llassert_always. This bug must have been extremely rare since it only happens when someone decreases their cache size and has more empty entries in their entries file than the total number of entries minus the new cache size.
| | * Validate textures starting with 00 too.Aleric Inglewood2010-10-251-1/+1
| | |
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-251-0/+8
| |\ \ | | |/
| | * Download prebuilt vivox (and 32bitcompatibilitylibs on 64bit) even when ↵Aleric Inglewood2010-10-251-0/+8
| | | | | | | | | | | | using standalone.
| * | 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.
| | * IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting ↵Aleric Inglewood2010-10-232-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | feature Disregard128DefaultDrawDistance Fix a bug that causes the last line of the feature table file to be read twice. This patch also removes the check for name.empty() because that will never be true, so might as well remove it.
| | * IMP-663: WARNING: replaceSubstitutionStrings: replaceSubstituionStrings ↵Aleric Inglewood2010-10-233-2/+4
| | | | | | | | | | | | | | | | | | | | | FAILURE: value: ignoretext repl: Caused by missing ignoretext in notifications.xml. Also fixed typos in debug output messages.
| | * IMP-662: WARNING: LLVFS: Using index file ↵Aleric Inglewood2010-10-232-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | /ramdisk/imprudence/cache/index.db2.x.606582153 These aren't warnings at all. They are printed when a LLVFS object was successfully created. Fixed by turning the warnings into INFO.
| | * IMP-661: WARNING: isFeatureAvailable: Feature RenderCubeMap not on feature list!Aleric Inglewood2010-10-232-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes this warning. Note that LLCubeMap::sUseCubeMaps is set to true by default, so this patch only has effect when the feature is actually NOT available. I tested that LLCubeMap::sUseCubeMaps is NOT used before the point where it is initialized now. The patch also adds an entry for IMP-660 to doc/contributions.txt that I had forgotten in the previous commit; and while I was at it, changes all RED- prefixes in IMP-.
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-231-9/+6
| |\ \ | | |/
| | * MP-660: Incorrect start up warningsAleric Inglewood2010-10-231-9/+6
| | | | | | | | | | | | | | | | | | Only try to remove the marker files when they were found in the first place. Also fixed the debug output regarding what value gLastExecEvent is being set to.
* | | 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-23135-2587/+5005
|\ \ \ | |/ /
| * | 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-22133-2554/+4973
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Changed version to Experimental 2010.10.17McCabe Maxsted2010-10-171-1/+1
| | |
| | * Updated the artwork package to include new easter eggs from Codie. This new ↵McCabe Maxsted2010-10-171-8/+8
| | | | | | | | | | | | package also includes new buy icons that are multiverse-friendly ($ instead of L$)
| | * Added several easter eggs to llgesturemgr.cpp (Codie's first commit)CodeBastard Redgrave2010-10-171-0/+201
| | |
| | * Changed several spinners in the texture tab from 0.1 incremets to 0.05 for ↵McCabe Maxsted2010-10-171-5/+5
| | | | | | | | | | | | better accuracy
| | * Ported list link number in tools window from the Ascent Viewer and ↵McCabe Maxsted2010-10-172-10/+63
| | | | | | | | | | | | Imprudenced it
| | * Ported fix for Apply button not working correctly when changing show group ↵McCabe Maxsted2010-10-171-2/+13
| | | | | | | | | | | | in profile option in the group window from Ascent Viewer
| | * Merge remote branch 'armin/weekly' into weeklyMcCabe Maxsted2010-10-172-7/+7
| | |\
| | | * fix bug #450 Terrain textures render rainbowArmin Weatherwax2010-10-162-7/+7
| | | |
| | * | Several minor changes to how group chat ignore works users won't seeMcCabe Maxsted2010-10-173-9/+12
| | | |
| | * | Added 'Clear History' button to the Teleport History from PhoenixMcCabe Maxsted2010-10-163-2/+23
| | | |
| | * | Select the correct preset when the windlight toolbar is first builtMcCabe Maxsted2010-10-161-0/+1
| | | |
| | * | Added detection for Python 2.7 (currently untested)McCabe Maxsted2010-10-161-0/+2
| | | |
| | * | Disabled inventory loading on login unless FetchInventoryOnLogin is true ↵McCabe Maxsted2010-10-162-2/+21
| | | | | | | | | | | | | | | | (default to false)
| | * | Ported profile button in friendship requests from PhoenixMcCabe Maxsted2010-10-162-2/+17
| | | |
| | * | Ported memory leak fix in llcommon/llstring.h from the Ascent ViewerMcCabe Maxsted2010-10-161-0/+1
| | | |
| | * | #77: Make URLs in group notices clickableMcCabe Maxsted2010-10-161-0/+1
| | | |
| | * | Don't dump callstacks at clean exit of viewer.Aleric Inglewood2010-10-161-10/+0
| | | |
| | * | More SNOW-802: disable http for bakes earlier.thickbrick2010-10-161-0/+4
| | | |
| | * | Port of SNOW-802: Use UDP for baked textures.thickbrick2010-10-165-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of SNOW-802 from SG1. Originally ported by Robin cornelius from SG 2.1. Also added a paramter can_use_http to the LLTextureFetchWorker constructor, to avoid messing with locks.