aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lscript (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-305-51/+55
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge remote-tracking branch 'origin/next' into WL-refactorDavid Walter Seikel2013-07-154-22/+25
| |\
| | * Attempt to fix up Windows yyparse issue, but ultimately fail, then notice ↵David Walter Seikel2013-04-171-7/+17
| | | | | | | | | | | | it's possibly not being used anyway, so just commit it.
| | * Use unix style bison build for cygwin.David Walter Seikel2013-04-171-3/+3
| | |
| | * Clean up some compiler warnings. More to come.David Walter Seikel2013-04-062-12/+5
| | |
| * | Comment answering a question in a previous comment.David Walter Seikel2012-03-311-0/+1
| | |
| * | Just some whitespace cleanup, coz my editor insists, coz I told it to insist.David Walter Seikel2012-03-311-29/+29
| |/
* | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-083-19/+19
| | | | | | | | ll_snprintf, namespace hacks confused vc2005
* | Merge remote-tracking branch 'mccabe/exp' into weeklyDavid Seikel2011-03-201-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 Maxsted2011-03-091-0/+1
| | | | | | | | patch by tx Oh
* | UNBRANDING! Conservativley remove references to "second life", replacing ↵David Seikel2011-02-131-1/+1
|/ | | | them with something generic.
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-072-0/+2
| | | | | | | | | | 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.
* WhiteStar Magic: update the lscript_library to match OpenSim 0.7Armin Weatherwax2010-10-221-5/+11
|
* Fixed some missing constants in the script editor and added ↵McCabe Maxsted2010-08-164-8/+52
| | | | llGetLinkNumberOfSides
* Include renamed lightshare functions in the script editorMcCabe Maxsted2010-06-261-0/+5
|
* Applied patch for LightShare viewer-side implementation.Jacek Antonelli2010-06-191-0/+7
| | | | Ported from Meta7 viewer by Armin.
* Improved OpenSim Scripting Language function tooltips.Jacek Antonelli2010-06-191-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 Sapinski2010-06-191-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.0McCabe Maxsted2010-04-141-0/+9
|
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-3043-69/+833
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-1133-33/+33
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-016-71/+129
|
* Second Life viewer sources 1.21.2-RCJacek Antonelli2008-09-122-0/+76
|
* Second Life viewer sources 1.21.1-RCJacek Antonelli2008-09-061-1/+1
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-0638-3976/+2628
|
* Second Life viewer sources 1.20.10Jacek Antonelli2008-08-151-3/+4
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-1514-538/+516
|
* Second Life viewer sources 1.20.6Jacek Antonelli2008-08-154-10/+14
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-152-21/+21
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-1516-2289/+2338
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-1538-74/+1091
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-1531-31/+31
|
* Second Life viewer sources 1.18.6.1-RCJacek Antonelli2008-08-156-0/+14
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-154-126/+144
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-1533-68/+257
|
* Second Life viewer sources 1.18.3.3-RCJacek Antonelli2008-08-152-2/+2
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-154-3/+18
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-155-8/+38
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-151-2/+2
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-153-19/+44
|
* Second Life viewer sources 1.17.0.12Jacek Antonelli2008-08-151-7/+0
|
* Second Life viewer sources 1.16.0.5Jacek Antonelli2008-08-152-1/+8
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-155-57/+77
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-1531-16/+47
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-1519-305/+1576
|
* Second Life viewer sources 1.13.2.15Jacek Antonelli2008-08-156-80/+71
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-1538-0/+28456