aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/CMakeLists.txt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Enabled gstreamer10 media plugin in CMake for WindowsMcCabe Maxsted2011-02-101-12/+12
|
* Henri Beauchamp: Display Names support v4Armin Weatherwax2011-01-241-0/+4
|
* move streaming audio out of gAudiop into its own class.Armin Weatherwax2011-01-041-0/+2
| | | | | | * might solve several issues with streaming audio, like: streaming audio not working when the sound effects driver fails. * breaks fmod. Sorry. If you want fmod go fix it, its probably not difficult.
* Added default_grids.xml to cmakeMcCabe Maxsted2010-11-131-0/+1
|
* Merge remote branch 'jacek/SNOW-713' into weeklyMcCabe Maxsted2010-11-121-1/+13
|\
| * IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-071-1/+13
| | | | | | | | | | | | | | | | | | | | See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
* | Install unstripped binary in packaged when --type=DebugAleric Inglewood2010-11-091-0/+3
|/ | | | | | | | | | This only affects linux. When one compiles the viewer with --type=Debug you want to be able to actually debug it, so you need debug symbols in the binary. Until now I manually copied imprudence-bin over the installed bin/do-not-directly-run-imprudence-bin, but this seems a more convient solution ;)
* Created new preferences panel to handle chat colors and name highlighting ↵McCabe Maxsted2010-11-051-0/+2
| | | | (removes the 'Extras' panel from Prefs > Advanced and moves the color options from 'Text Chat')
* Rename hippo* files to lower case (PART 2 OF 2)Aleric Inglewood2010-11-051-6/+6
| | | | | | | | | | | 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. This is part 2 or 2 (the first part just renamed the files). This part changes all files to make the viewer compile again after the renaming.
* Merged webkit_plugins into weekly. Huzzah! The weekly branch now has ↵McCabe Maxsted2010-11-021-13/+100
|\ | | | | | | browser/media plugin support
| * Remove explicit dependency of windows on media_plugin_gstreamer010Aleric Inglewood2010-10-281-1/+1
| |
| * Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-281-0/+2
| |\
| * | Load mime_types_windows.xml instead of mime_types.xml so we can fallback on ↵McCabe Maxsted2010-10-271-2/+2
| | | | | | | | | | | | the version in the skins directory correctly
| * | Fixed mime_types.xml not being copied on Windows (also fixes plugin dll ↵McCabe Maxsted2010-10-271-13/+26
| | | | | | | | | | | | copying error)
| * | Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to ↵Robin Cornelius2010-10-101-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-101-13/+91
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Let the gstreamer plugin build on windowsRobin Cornelius2010-10-101-4/+16
| | | | |
| | * | | fix platform specific mime_type xml loadingArmin Weatherwax2010-09-231-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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 :) )
| | * | | port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-0/+4
| | | | | | | | | | | | | | | | | | | | texture system
| | * | | Robin Cornelius: fixes for building plugins on Linux 64bitArmin Weatherwax2010-09-231-0/+2
| | | | |
| | * | | make it compile and run.Armin Weatherwax2010-09-231-1/+0
| | | | | | | | | | | | | | | | | | | | TODO: llpanellandmedia.cpp and llviewermedia.cpp need a proper fix
| | * | | Removed some bad merge entries from newview/CMakeLists.txtMcCabe Maxsted2010-09-231-2/+0
| | | | |
| | * | | Fixed newview\CMakeLists.txt not parsing on WindowsMcCabe Maxsted2010-09-231-5/+4
| | | | |
| | * | | llmediaplugins first stepArmin Weatherwax2010-09-231-12/+88
| | | | |
* | | | | Fixed message builder files missing from CMakeMcCabe Maxsted2010-11-011-0/+4
| | | | |
* | | | | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵RevolutionSmythe2010-11-011-0/+9
| |_|_|/ |/| | | | | | | | | | | for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
* | | | Prim alignment tool by Qarl, backported by Jacek.Jacek Antonelli2010-10-231-0/+2
| |_|/ |/| | | | | | | | | | | Qarl has given permission to use this code under the terms of the GPL v2 + FLOSS exception and/or the LGPL v2.1.
* | | Added install.xml to the IDE under the 'Library Install File' folderMcCabe Maxsted2010-10-091-0/+13
| | |
* | | Applied RLVa-1.1.2-Imprudence.patch by Kitty BarnettMcCabe Maxsted2010-10-091-1/+2
|/ /
* | #489: added /LARGEADDRESSAWARE to the Windows linker command line settingsMcCabe Maxsted2010-10-021-2/+2
| |
* | VWR-14426: Link step fails on Linux when LDFLAGS is setAleric Inglewood2010-10-011-1/+1
| | | | | | | | See http://redmine.imprudenceviewer.org/issues/572
* | RED-565: Building the package/ directory fails for standalone.Aleric Inglewood2010-10-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://redmine.imprudenceviewer.org/issues/565 This patch also reorders the "help" text of llmanifest.py to be alphabetical, next to adding the option --standalone with help text. indra/newview/CMakeLists.txt is changed to pass --standalone to the python script. Finally, viewer_manifest.py, which inherits from llmanifest.py uses it to skip the sections that don't make sense when building standalone, and which fail with errors without this patch. This patch is not 100% tested: I don't have a Mac or windows. However, it ONLY touches 'standalone', and before my patches standalone was broken anyway. So, even if this doesn't fix it completely for Mac and/or windows, then it can't hurt to commit, or even release. Even if this fails, the errors are not fatal: the packaging fails, but the viewer is already compiled at this point. I'd advise against holding this back until it could be tested by a Mac or windows developer that can build standalone: that might never happen to begin with! When time comes, some other developer will test it and when there are still problems, fix it, on the other operating systems.
* | Added handler for new OpenSim function "OpenRegionInfo", more info at ↵Patrick Sapinski2010-09-221-0/+1
|/ | | | | | http://imprudenceviewer.org/wiki/Opensim_information_needed Currently only supports a fraction of the provided parameters.
* Added Preferences > Fonts tab, with basic font chooser.Jacek Antonelli2010-09-101-0/+2
| | | | Choosing a font sets FontChoice setting, but no real effect yet.
* store our password in the Mac OS keychainNemurimasu Neiro2010-09-101-0/+2
| | | | much more secure than XORing against a MAC address :)
* Applied #472: teleport history from Emerald, patch by Ansariel Hiler, ↵McCabe Maxsted2010-09-071-0/+2
| | | | feature originally by Zi Ree
* pull boost 1.39 from LL for Linux32, add boost system and boost filesystem ↵Armin Weatherwax2010-09-011-0/+2
| | | | to cmake
* Moved chatbar commandline options into their own window, cleaned up more stuffMcCabe Maxsted2010-09-011-0/+2
|
* added autocorrect functionality and floaterPatrick Sapinski2010-08-301-0/+4
|
* added spellcheck + translation from Emerald Viewer. references to ↵Patrick Sapinski2010-08-301-0/+14
| | | | modularsystems.sl should be changed!
* Ported local textures from Emerald (requires boost filesystem and system ↵McCabe Maxsted2010-08-281-0/+2
| | | | libs to work)
* automatically add all XUI to solutionPatrick Sapinski2010-08-281-219/+14
|
* Added vivox license window when enabling voice or starting up for the first ↵McCabe Maxsted2010-08-281-0/+3
| | | | time (voice can now be included from here on out :)
* Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.eMcCabe Maxsted2010-08-191-2/+2
|
* Added meta7windlight.h file to CMakeMcCabe Maxsted2010-08-101-0/+1
|
* remove llpanelmorphArmin Weatherwax2010-08-091-2/+0
|
* Merge commit 'jacek/next' into weeklyMcCabe Maxsted2010-08-021-0/+2
|\
| * Refactored a bunch of messy LightShare code.Jacek Antonelli2010-08-011-0/+2
| |
* | Removed unused ZHAO entries from the AO template and added it to cmakeMcCabe Maxsted2010-08-011-0/+1
| |