Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'imprudence/next' into next | David Walter Seikel | 2013-08-30 | 2 | -10/+20 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Attempt to fix up Windows yyparse issue, but ultimately fail, then notice ↵ | David Walter Seikel | 2013-04-17 | 1 | -7/+17 |
| | | | | | | | | it's possibly not being used anyway, so just commit it. | ||||
| * | Use unix style bison build for cygwin. | David Walter Seikel | 2013-04-17 | 1 | -3/+3 |
| | | |||||
| * | Fixed some missing constants in the script editor and added ↵ | McCabe Maxsted | 2010-08-26 | 3 | -5/+48 |
| | | | | | | | | llGetLinkNumberOfSides | ||||
* | | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵ | Chris Tuchs | 2011-05-08 | 1 | -8/+8 |
| | | | | | | | | ll_snprintf, namespace hacks confused vc2005 | ||||
* | | Fixed some missing constants in the script editor and added ↵ | McCabe Maxsted | 2010-08-16 | 3 | -5/+48 |
|/ | | | | llGetLinkNumberOfSides | ||||
* | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 17 | -31/+229 |
| | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 15 | -15/+15 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -8/+29 |
| | |||||
* | Second Life viewer sources 1.21.2-RC | Jacek Antonelli | 2008-09-12 | 2 | -0/+76 |
| | |||||
* | Second Life viewer sources 1.21.1-RC | Jacek Antonelli | 2008-09-06 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 19 | -2054/+1462 |
| | |||||
* | Second Life viewer sources 1.20.10 | Jacek Antonelli | 2008-08-15 | 1 | -3/+4 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 8 | -278/+283 |
| | |||||
* | Second Life viewer sources 1.20.6 | Jacek Antonelli | 2008-08-15 | 4 | -10/+14 |
| | |||||
* | Second Life viewer sources 1.20.2 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 6 | -1059/+1071 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 20 | -42/+507 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 15 | -15/+15 |
| | |||||
* | Second Life viewer sources 1.18.6.1-RC | Jacek Antonelli | 2008-08-15 | 2 | -0/+4 |
| | |||||
* | Second Life viewer sources 1.18.6.0-RC | Jacek Antonelli | 2008-08-15 | 4 | -126/+144 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 17 | -12/+53 |
| | |||||
* | Second Life viewer sources 1.18.3.3-RC | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.18.3.2-RC | Jacek Antonelli | 2008-08-15 | 3 | -3/+16 |
| | |||||
* | Second Life viewer sources 1.18.1.2 | Jacek Antonelli | 2008-08-15 | 3 | -2/+16 |
| | |||||
* | Second Life viewer sources 1.17.1.0 | Jacek Antonelli | 2008-08-15 | 2 | -18/+43 |
| | |||||
* | Second Life viewer sources 1.17.0.12 | Jacek Antonelli | 2008-08-15 | 1 | -7/+0 |
| | |||||
* | Second Life viewer sources 1.16.0.5 | Jacek Antonelli | 2008-08-15 | 1 | -1/+7 |
| | |||||
* | Second Life viewer sources 1.15.1.3 | Jacek Antonelli | 2008-08-15 | 1 | -0/+2 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 15 | -9/+23 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 11 | -156/+836 |
| | |||||
* | Second Life viewer sources 1.13.2.15 | Jacek Antonelli | 2008-08-15 | 1 | -3/+3 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 19 | -0/+17182 |