Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'imprudence/next' into next | David Walter Seikel | 2013-08-30 | 1 | -29/+30 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Comment answering a question in a previous comment. | David Walter Seikel | 2012-03-31 | 1 | -0/+1 |
| | | |||||
| * | Just some whitespace cleanup, coz my editor insists, coz I told it to insist. | David Walter Seikel | 2012-03-31 | 1 | -29/+29 |
| | | |||||
* | | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵ | Chris Tuchs | 2011-05-08 | 1 | -7/+7 |
| | | | | | | | | ll_snprintf, namespace hacks confused vc2005 | ||||
* | | 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 | ||||
| * | #713: add a ossl osUnixTimeToTimestamp() function for syntax highlighting, ↵ | McCabe Maxsted | 2011-03-09 | 1 | -0/+1 |
| | | | | | | | | patch by tx Oh | ||||
* | | UNBRANDING! Conservativley remove references to "second life", replacing ↵ | David Seikel | 2011-02-13 | 1 | -1/+1 |
|/ | | | | them with something generic. | ||||
* | WhiteStar Magic: update the lscript_library to match OpenSim 0.7 | Armin Weatherwax | 2010-10-22 | 1 | -5/+11 |
| | |||||
* | Fixed some missing constants in the script editor and added ↵ | McCabe Maxsted | 2010-08-16 | 1 | -3/+4 |
| | | | | llGetLinkNumberOfSides | ||||
* | Include renamed lightshare functions in the script editor | McCabe Maxsted | 2010-06-26 | 1 | -0/+5 |
| | |||||
* | Applied patch for LightShare viewer-side implementation. | Jacek Antonelli | 2010-06-19 | 1 | -0/+7 |
| | | | | Ported from Meta7 viewer by Armin. | ||||
* | Improved OpenSim Scripting Language function tooltips. | Jacek Antonelli | 2010-06-19 | 1 | -80/+77 |
| | | | | | | | * Rewrote/tweaked some tooltips for quality. * Shortened some very long tooltips. * Removed wiki URLs (which are unclickable and pretty useless). * Mentioned that the functions are 'OpenSim only'. | ||||
* | Added OpenSim Scripting Language functions to script editor. | Patrick Sapinski | 2010-06-19 | 1 | -0/+94 |
| | | | | | | With documentation help from WhiteStar from OpenSim. Signed-off-by: Jacek Antonelli <jacek.antonelli@gmail.com> | ||||
* | Added prim media functions and new script functions from SL server 1.38.0 | McCabe Maxsted | 2010-04-14 | 1 | -0/+9 |
| | |||||
* | Second Life viewer sources 1.23.0-RC | Jacek Antonelli | 2009-04-30 | 3 | -3/+12 |
| | |||||
* | Second Life viewer sources 1.22.5-RC | Jacek Antonelli | 2009-01-11 | 3 | -3/+3 |
| | |||||
* | Second Life viewer sources 1.22.0-RC | Jacek Antonelli | 2008-12-01 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.21.0-RC | Jacek Antonelli | 2008-09-06 | 5 | -756/+52 |
| | |||||
* | Second Life viewer sources 1.20.7 | Jacek Antonelli | 2008-08-15 | 1 | -1/+1 |
| | |||||
* | Second Life viewer sources 1.19.1.0 | Jacek Antonelli | 2008-08-15 | 4 | -555/+567 |
| | |||||
* | Second Life viewer sources 1.19.0.0 | Jacek Antonelli | 2008-08-15 | 4 | -6/+278 |
| | |||||
* | Second Life viewer sources 1.18.6.4-RC | Jacek Antonelli | 2008-08-15 | 3 | -3/+3 |
| | |||||
* | Second Life viewer sources 1.18.6.1-RC | Jacek Antonelli | 2008-08-15 | 2 | -0/+5 |
| | |||||
* | Second Life viewer sources 1.18.4.0-RC | Jacek Antonelli | 2008-08-15 | 3 | -1/+10 |
| | |||||
* | 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 | 1 | -0/+2 |
| | |||||
* | Second Life viewer sources 1.16.0.5 | Jacek Antonelli | 2008-08-15 | 1 | -0/+1 |
| | |||||
* | Second Life viewer sources 1.15.1.3 | Jacek Antonelli | 2008-08-15 | 1 | -6/+1 |
| | |||||
* | Second Life viewer sources 1.15.0.2 | Jacek Antonelli | 2008-08-15 | 3 | -1/+4 |
| | |||||
* | Second Life viewer sources 1.14.0.0 | Jacek Antonelli | 2008-08-15 | 3 | -82/+317 |
| | |||||
* | Second Life viewer sources 1.13.2.15 | Jacek Antonelli | 2008-08-15 | 3 | -4/+63 |
| | |||||
* | Second Life viewer sources 1.13.2.12 | Jacek Antonelli | 2008-08-15 | 4 | -0/+1907 |