aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/CMakeLists.txt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-33/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same. Conflicts: .gitignore linden/indra/develop.py linden/indra/llcommon/llsdserialize_xml.cpp linden/indra/newview/CMakeLists.txt Manually combined MOAP, OTR, and WL changes from both. linden/indra/newview/app_settings/default_grids.xml Manually merged the grid collection. Also updated IG info. linden/indra/newview/hippoupdate.cpp linden/indra/newview/llettherebelight.cpp Just used the Imprudence copy. linden/indra/newview/llviewermessage.cpp Keep unbranding. linden/indra/newview/llvoavatar.cpp Manually merge client tags. linden/indra/newview/res/viewerRes.rc Manually merge version from Impy. linden/indra/newview/skins/dark/colors_base.xml Keep unbranding. linden/indra/newview/skins/default/html/unabletoconnect.png linden/indra/newview/skins/default/textures/icon_top_pick.tga linden/indra/newview/skins/default/xui/en-us/floater_about.xml Manual merging of contributors. linden/indra/newview/skins/gemini/colors_base.xml Keep unbranding. linden/indra/newview/skins/gemini/textures/icon_top_pick.tga linden/indra/newview/viewer_manifest.py Manually merged boost, gstreamer, OTR, and name. linden/indra/newview/viewerinfo.cpp Manually merge the comment.
| * Merge remote-tracking branch 'origin/next' into WL-refactorDavid Walter Seikel2013-07-151-34/+34
| |\
| | * Clean out no longer needed commented code.David Walter Seikel2013-05-131-4/+0
| | |
| | * Update the basic graphics detail slider.David Seikel2013-05-131-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low.
| | * Make nmake builds more like VS builds.David Walter Seikel2013-04-261-21/+21
| | | | | | | | | | | | Still some tweaking to go, therefore, still some rough bits in this.
| | * New branch for building with nmake.David Walter Seikel2013-04-181-2/+2
| | | | | | | | | | | | This is a branch, coz it's still crap.
| | * MOAP Radar patch setRobin Cornelius2013-04-051-0/+4
| | |
| * | Merge a bunch of duplicated Windlight sharing code.David Walter Seikel2012-04-021-2/+0
| | |
| * | Remove some left over WindLight cruft.David Walter Seikel2012-03-311-1/+0
| |/
| * Merge the artwork and font "prebuilt" packages into the source repo, as ↵David Walter Seikel2012-03-011-1/+0
| | | | | | | | | | | | | | | | discussed on IRC and the mailing list, and remove some SL logos. I know, there are two slightly different LICENSE-logos.txt files. One that was originally in the source repo, one that was from the artwork package. I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2012-02-201-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: linden/indra/newview/installers/windows/meta-impy_installer_template.iss Branding conflict, fixed. linden/indra/newview/llviewerwindow.cpp Already had this change, but merged the minor difference.
| * Added the new ISS installer template to cmakeMcCabe Maxsted2012-02-181-1/+1
| |
* | Merge branch 'next' of git://github.com/imprudence/imprudence into nextDavid Walter Seikel2011-12-031-11/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the new "Set your own Imprudence tag colour feature". Should check though, might be bits left that where not obvious. Conflicts: .gitignore linden/indra/cmake/00-Common.cmake linden/indra/newview/llvoavatar.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerinfo.cpp The usual branding conflicts.
| * Don't run vstool.exe when using an express version of vc++, by CobraElDiablo ↵McCabe Maxsted2011-09-081-11/+13
| | | | | | | | from the Astra Viewer
* | Merge remote-tracking branch 'imprudence/1.4-beta1.5' into nextDavid Walter Seikel2011-07-211-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts (merged manually): .gitignore linden/indra/newview/llgesturemgr.cpp linden/indra/newview/viewerinfo.cpp
| * Created new window for selectively clearing different parts of the cache ↵McCabe Maxsted2011-06-301-0/+2
| | | | | | | | from disk
| * Created new window for inworld dice rolling in advanced > UI. Todo: add ↵McCabe Maxsted2011-06-231-0/+2
| | | | | | | | button for 'rocks fall, everybody dies'
* | Fix up gcrypt and gpg-error compiling and linking. Much cleaner now,and ↵David Walter Seikel2011-07-191-6/+4
| | | | | | | | Windows might work again.
* | Clean out no longer needed commented code.David Walter Seikel2011-06-291-4/+0
| |
* | Build libgpg-error and libgcrypt under linux, for OTR.David Walter Seikel2011-06-281-21/+24
| | | | | | | | | | | | | | There is still a problem, the linux compile script (number 3) will bomb out at the link stage, but simply starting it again it runs fine. This was too much work, and it's way past my bed time. It works, so commiting it now, and fixing that problem later. Still could use some cleaning up to.
* | Update the basic graphics detail slider.David Seikel2011-06-091-4/+4
| | | | | | | | | | | | | | | | | | Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them. And looks like they left crap laying around from the old method. Removed the crap. Updated the values the slider uses to better suit modern equipment, while leaving the low end the same. Pumped up "linden" tree rendering, it was way too low.
* | Merge branch 'next' of git://github.com/jacek/imprudence into nextDavid Seikel2011-06-041-100/+83
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts (manually merged): linden/indra/llcommon/llversionviewer.h linden/indra/llvfs/lldir.cpp linden/indra/llvfs/lldir_mac.cpp linden/indra/newview/CMakeLists.txt linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/Info-Imprudence.plist linden/indra/newview/Info-meta-impy.plist linden/indra/newview/llappviewer.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/packaging/mac/Info.plist.in linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml linden/indra/newview/skins/default/xui/zh/menu_viewer.xml linden/indra/newview/skins/default/xui/zh/panel_group_general.xml linden/indra/newview/viewer_manifest.py linden/indra/newview/viewerversion.cpp linden/indra/newview/viewerversion.h linden/install.xml Also some post merge tweaks.
| * Fixed Linux viewer_manifest.py not running after each build.Jacek Antonelli2011-05-261-0/+1
| |
| * Merge branch 'viewerinfo' into nextJacek Antonelli2011-05-251-98/+83
| |\
| | * Removed viewerversion.xml, since it's not used anymore.Jacek Antonelli2011-05-251-1/+0
| | |
| | * Ported Mac packaging system from Kokua.Jacek Antonelli2011-05-211-57/+32
| | | | | | | | | | | | Build the "package" target in Xcode to create a DMG.
| | * Moved Mac packaging files to newview/packaging/mac.Jacek Antonelli2011-05-211-7/+7
| | |
| | * Ported Linux packaging system from Kokua.Jacek Antonelli2011-05-201-31/+42
| | | | | | | | | | | | Run "make package" in the build directory to create a tarball.
| | * Ported viewerinfo.cpp from Kokua.Jacek Antonelli2011-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It defines the ViewerInfo module/namespace, which contains a variety of functions for querying the viewer name and version. It is designed to be a replacement for viewerversion.cpp and viewerversion.xml. viewerversion.cpp has been removed, but viewerversion.xml remains (albeit with a bogus version number) until the packaging system no longer uses it.
| * | Besides the numerous label and organizational changes, here are the main pointsMcCabe Maxsted2011-05-041-2/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * Moved numerous options out of the Advanced panel * Moved numerous options out of the General panel * Combined the Network and Web Browser panels * Combined IM, Chat, and Spell checking preferences * Combined 'Show timestamps in IMs' and 'Show timestamps in Local Chat' to one ShowTimestamps setting * Removed UI for 'hide my own group title'. This can still be set in the debug settings * Renamed Popups > Notifications * Renamed Chat Colors > Colors * Renamed 'IMs and Logging' to 'Logging and Privacy' * Moved Colors next to Skins * Added style guide to the top of every preferences panel xui
* | Merge branch 'libotr' into expDavid Seikel2011-05-121-1/+73
|\ \ | | | | | | | | | | | | | | | Conflicts: linden/indra/llmessage/message.cpp linden/indra/newview/llprefsadvanced.cpp
| * | Windows build change I am sure ofChris Tuchs2011-05-081-0/+4
| | |
| * | Merge branch 'libotr' of github.com:onefang/meta-impy into libotrJay Threeth2011-04-231-0/+2
| |\ \
| | * | Move tho OTR preferences to their own floater, with a button in the IM tab.David Seikel2011-04-191-0/+2
| | | | | | | | | | | | | | | | This brings that part in line with the general impy look and feel.
| * | | Build libotr, and static link it, libgpg-error and libgcrypt into the exe ↵Jay Threeth2011-04-231-2/+20
| |/ / | | | | | | | | | (on linux)
| * | last of the hand diff mergesJay Threeth2011-04-031-0/+48
| | |
* | | Merge remote-tracking branch 'imprudence/exp' into expDavid Seikel2011-04-261-0/+2
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | Conflicts (for future reference): linden/indra/llcommon/llstring.cpp linden/indra/newview/llpanelnetwork.cpp linden/indra/newview/llselectmgr.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/lltoolmgr.cpp linden/indra/newview/llvoavatar.cpp
| * Ported Radar v9 patch from Henri Beauchamp (et al.) to Imp, placed it in the ↵McCabe Maxsted2011-04-131-0/+2
| | | | | | | | Advanced menu
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
| * Henri Beauchamps version of Sione Lomus media filter patch.Armin Weatherwax2011-03-131-0/+2
| | | | | | | | | | | | from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function." Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid
* | We don't care if LL changes their protocol, and one less thing to need the ↵David Seikel2011-03-021-1/+1
| | | | | | | | 'net for during the build.
* | Merge branch 'weekly' into brandingDavid Seikel2011-02-201-12/+18
|\ \ | |/ | | | | | | | | | | Conflicts (solved): linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llappviewerwin32.cpp
| * 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.
* | Change imprudence -> meta-impy, though not the URLs. Probably some will ↵David Seikel2011-02-091-12/+12
| | | | | | | | | | | | need to be reverted later. Changed file names to.
* | Artwork and font files in the repo now.David Seikel2011-02-081-1/+0
|/ | | | | My policy is to have it all in the repo. None of this downloading pre built stuff from people with no guarantee that they will still have the files a month from now. Been burnt with that before.
* 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.
generated by cgit v1.1 at 2024-11-15 19:20:26 +0000