Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'imprudence/next' into next | David Walter Seikel | 2013-08-30 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Make nmake builds more like VS builds. | David Walter Seikel | 2013-04-26 | 1 | -1/+1 |
| | | | | | | | | Still some tweaking to go, therefore, still some rough bits in this. | ||||
| * | Changed the 'bundle identifier' to org.imprudenceviewer.viewer. | Jacek Antonelli | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | | | This is used on Mac OS X to identify the application. Thanks to Solo Mornington for this information. | ||||
* | | Unbranding word of the day is "Second Life". | David Seikel | 2011-02-26 | 1 | -1/+1 |
| | | |||||
* | | Changed the 'bundle identifier' to org.imprudenceviewer.viewer. | Jacek Antonelli | 2010-09-10 | 1 | -1/+1 |
|/ | | | | | This is used on Mac OS X to identify the application. Thanks to Solo Mornington for this information. | ||||
* | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 3 | -3/+6 |
| | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 3 | -3/+5 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 2 | -13/+8 |
| | |||||
* | Second Life viewer sources 1.21.3-RC | Jacek Antonelli | 2008-09-28 | 3 | -0/+54 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 3 | -8/+87 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 3 | -6/+6 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 3 | -3/+3 |
| | |||||
* | Second Life viewer sources 1.18.6.0-RC | Jacek Antonelli | 2008-08-15 | 3 | -661/+400 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 1 | -4/+3 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 1 | -9/+18 |
| | |||||
* | Second Life viewer sources 1.13.2.15 | Jacek Antonelli | 2008-08-15 | 1 | -3/+11 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 1 | -0/+688 |