Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'jacek/exp' into exp | David Seikel | 2011-04-03 | 1 | -6/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore linden/indra/newview/English.lproj/InfoPlist.strings linden/indra/newview/llpanellogin.cpp linden/indra/newview/res/viewerRes.rc linden/indra/newview/skins/default/xui/en-us/panel_login.xml linden/install.xml Mostly went with my originals, manually merged llpaterrogin.cpp and panel_login.xml. | ||||
| * | Fix #838: disable hiding of stream urls | thickbrick | 2011-04-01 | 1 | -6/+0 |
| | | | | | | | | | | NoObscuredURL Patch from Henri Beauchamp, applied by hand because of changes between Imprudence and Snowglobe. | ||||
* | | Merge remote-tracking branch 'mccabe/exp' into weekly | David Seikel | 2011-03-20 | 1 | -0/+1 |
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | | | | | | | | 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 | -1/+2 |
| | | |||||
* | | Unbranding. Todays word is "linden". | David Seikel | 2011-02-25 | 1 | -1/+1 |
|/ | |||||
* | IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins | Aleric Inglewood | 2010-11-07 | 1 | -1/+1 |
| | | | | | | | | | | 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. | ||||
* | llmediaplugins first step | Armin Weatherwax | 2010-09-23 | 1 | -0/+25 |
| | |||||
* | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 1 | -4/+37 |
| | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 1 | -30/+30 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -0/+22 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -2/+2 |
| | |||||
* | 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 | -12/+12 |
| | |||||
* | Second Life viewer sources 1.18.5.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -2/+4 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -17/+16 |
| | |||||
* | Second Life viewer sources 1.17.3.0 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.17.1.0 | Jacek Antonelli | 2008-08-15 | 1 | -1/+0 |
| | |||||
* | Second Life viewer sources 1.17.0.12 | Jacek Antonelli | 2008-08-15 | 1 | -11/+33 |
| | |||||
* | 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 | -5/+5 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -5/+1 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+595 |