Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'next' of git://github.com/jacek/imprudence into next | David Seikel | 2011-06-19 | 1 | -2/+1 |
|\ | | | | | | | | | | | | | Conflicts (manually merged the grids, ignored the other two): linden/indra/newview/app_settings/default_grids.xml linden/indra/newview/llvoavatar.cpp linden/indra/newview/skins/default/xui/en-us/panel_login.xml | ||||
| * | Fixed a nonfunctional help button in the Region/Estate window. | Jacek Antonelli | 2011-06-15 | 1 | -2/+1 |
| | | | | | | | | | | The help button for Minimum Agent Age was being initialized in the code for the Debug tab, when it's actually in the Region tab. | ||||
* | | Grr, try this post merge fixup again. | David Seikel | 2011-03-20 | 1 | -158/+32 |
| | | |||||
* | | These two files got stomped all over when they where converted to unix line ↵ | David Seikel | 2011-03-20 | 1 | -23/+2 |
| | | | | | | | | endings, so re-apply my changes. | ||||
* | | Merge remote-tracking branch 'mccabe/exp' into weekly | David Seikel | 2011-03-20 | 1 | -3300/+3447 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fixed bad line endings (CRLF) in many files. | Jacek Antonelli | 2011-03-18 | 1 | -3446/+3446 |
| | | | | | | | | | | Windows users, please set "autocrlf = input" or "autocrlf = true" in your .git/config [core] section to avoid this in the future. | ||||
| * | Merge in Var Sized Regions into the Imprudence Experimental. | RevolutionSmythe | 2011-03-18 | 1 | -4/+4 |
| | | |||||
* | | Remove special handling of linden estates. We don't have them in meta, and ↵ | David Seikel | 2011-02-10 | 1 | -176/+30 |
|/ | | | | | | that sort of policy should be server side anyway. It's good to remove useless code. As usual I found three ways of recognising linden estates being used in the code, makes it hard to find them all. Might be some left over. | ||||
* | IMP-692: SNOW-713: Fixed compile bug fixes. | Aleric Inglewood | 2010-11-07 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Changes: * Added changes from snowglobe 1.5 to indra/llcommon/llstring.h (compile errors as a result of a missing include, but I copied everything else too). * Added #include "linden_common.h" to emeraldboobutils.cpp. Really it's one the header files that needed that, but that's how this header works: every source file should include it as first header anyway, then there is no need for other headers to do that. * Renamed LLPanelRegionOpenSettingsInfo::sendUpdate(void*) to LLPanelRegionOpenSettingsInfo::onClickOrs because it was hiding a virtual function (BOOL sendUpdate(void)). * Made cutToClipboard more equal to copyToClipboard (was also hiding a virtual function). * Install libllcommon.so in lib64 on Linux_x86_64, instead of lib. | ||||
* | Rename hippo* files to lower case (PART 2 OF 2) | Aleric Inglewood | 2010-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | 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. | ||||
* | Use the right name for the Aurora capability | McCabe Maxsted | 2010-11-01 | 1 | -1/+1 |
| | |||||
* | Fixed crash when logging into an Aurora sim without the region/estate window ↵ | McCabe Maxsted | 2010-11-01 | 1 | -5/+10 |
| | | | | open | ||||
* | Don't show the open region settings panel in the Estate window when the ↵ | McCabe Maxsted | 2010-11-01 | 1 | -4/+9 |
| | | | | OpenRegionSettings capability isn't found (i.e. we're not on Aurora) | ||||
* | Finishes the OpenRegionSettings module, adds a new panel to Region/Estate ↵ | RevolutionSmythe | 2010-11-01 | 1 | -3298/+3436 |
| | | | | 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. | ||||
* | Applied RLVa-1.1.2-Imprudence.patch by Kitty Barnett | McCabe Maxsted | 2010-10-09 | 1 | -0/+4 |
| | |||||
* | Merged working branch of 1.2 into LL 1.23 merge | McCabe Maxsted | 2009-10-18 | 1 | -0/+19 |
|\ | |||||
| * | Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch. | Jacek Antonelli | 2009-09-04 | 1 | -0/+19 |
| | | | | | | | | Made a few non-functional changes to help it apply. | ||||
* | | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 1 | -228/+309 |
|/ | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.21.6 | Jacek Antonelli | 2008-10-17 | 1 | -1/+0 |
| | |||||
* | Second Life viewer sources 1.21.5-RC | Jacek Antonelli | 2008-10-08 | 1 | -0/+2 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -166/+163 |
| | |||||
* | Second Life viewer sources 1.20.8 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -0/+3 |
| | |||||
* | Second Life viewer sources 1.20.2 | Jacek Antonelli | 2008-08-15 | 1 | -151/+156 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -26/+166 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -50/+45 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.18.6.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -15/+37 |
| | |||||
* | Second Life viewer sources 1.18.4.1-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+2 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -32/+66 |
| | |||||
* | Second Life viewer sources 1.18.3.2-RC | Jacek Antonelli | 2008-08-15 | 1 | -8/+14 |
| | |||||
* | Second Life viewer sources 1.18.1.2 | Jacek Antonelli | 2008-08-15 | 1 | -3/+23 |
| | |||||
* | Second Life viewer sources 1.17.3.0 | Jacek Antonelli | 2008-08-15 | 1 | -0/+5 |
| | |||||
* | Second Life viewer sources 1.16.0.5 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.15.1.3 | Jacek Antonelli | 2008-08-15 | 1 | -19/+0 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -36/+37 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -64/+77 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+2970 |