aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/lscript/lscript_execute (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-302-12/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Clean up some compiler warnings. More to come.David Walter Seikel2013-04-062-12/+5
| |
* | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-081-4/+4
|/ | | | ll_snprintf, namespace hacks confused vc2005
* IMP-692: SNOW-713: Global objects in libllcommon duplicated in pluginsAleric Inglewood2010-11-071-0/+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.
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-309-11/+313
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-115-5/+5
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-31/+53
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-065-1093/+676
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-153-257/+230
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-154-665/+665
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-156-10/+290
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-155-5/+5
|
* Second Life viewer sources 1.18.6.1-RCJacek Antonelli2008-08-152-0/+5
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-155-50/+125
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-152-6/+22
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-152-50/+71
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-155-4/+10
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-153-42/+353
|
* Second Life viewer sources 1.13.2.15Jacek Antonelli2008-08-151-3/+3
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-156-0/+6417
generated by cgit v1.1 at 2025-04-17 01:37:49 +0000