aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llprimitive (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'imprudence/next' into nextDavid Walter Seikel2013-08-301-10/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Material UUIDs are defined in two places, deleted one.David Walter Seikel2013-04-081-10/+0
| |
* | Windows build changes, maybe only needed for vc2005. Mostly snprintf -> ↵Chris Tuchs2011-05-081-1/+1
| | | | | | | | ll_snprintf, namespace hacks confused vc2005
* | Seems we need to hard code the meta7 tag colours. Also did the Imprudence ↵David Seikel2011-02-091-1/+2
|/ | | | | | colours, coz dark purple on black is just unreadable. Invented a tag for meta-impy to.
* Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-1017-423/+3045
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * Removed more unused 'prepare' dependenciesMcCabe Maxsted2010-09-231-1/+0
| |
| * port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 ↵Armin Weatherwax2010-09-231-0/+1
| | | | | | | | texture system
| * make it compile and run.Armin Weatherwax2010-09-231-95/+1
| | | | | | | | TODO: llpanellandmedia.cpp and llviewermedia.cpp need a proper fix
| * port llprimitive from SG2.0Armin Weatherwax2010-09-2317-333/+3049
| |
* | RED-556: SNOW-800: Massively duplicated objectsAleric Inglewood2010-10-012-8/+18
|/ | | | See http://redmine.imprudenceviewer.org/issues/556
* feature: have clothing layer protection on and don't broadcast client nameArmin Weatherwax2010-06-192-4/+7
|
* fix: alpha not showing on other clients when clothing layer protection onArmin Weatherwax2010-06-191-1/+1
| | | | thanks to Emerald for fixing it and Katharine Berry for pointing to the fix :)
* Fixed llendl to llendl; in llprimitive.cppMcCabe Maxsted2010-06-191-13/+13
|
* Use opensim limits for hollow (99) and hole (0.01). Need to add option to ↵McCabe Maxsted2010-04-182-2/+0
| | | | enable in the ui
* Updated llprimitive/llprimitive.cpp to SL 1.23.Armin Weatherwax2010-02-271-201/+4
|
* added our uuidArmin Weatherwax2009-12-021-1/+1
| | | | | modified: linden/indra/llprimitive/llprimitive.cpp modified: linden/indra/newview/llvoavatar.cpp
* Emeralds client name tag and clothing layer protection. Needs decision about ↵Armin Weatherwax2009-12-012-7/+214
| | | | | | | | | | | | | | | | a few things - find "Imprudence FIXME" (woq) in llprimitive.cpp and llvoavatar.cpp, its commented there. modified: linden/indra/llprimitive/llprimitive.cpp modified: linden/indra/llprimitive/llprimitive.h modified: linden/indra/newview/app_settings/settings.xml modified: linden/indra/newview/llagent.cpp modified: linden/indra/newview/llappviewer.cpp modified: linden/indra/newview/llfirstuse.cpp modified: linden/indra/newview/llfirstuse.h modified: linden/indra/newview/llstartup.cpp modified: linden/indra/newview/llvoavatar.cpp modified: linden/indra/newview/llvoavatar.h modified: linden/indra/newview/skins/default/xui/en-us/notifications.xml
* Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-3019-30/+64
|
* Second Life viewer sources 1.22.6-RCJacek Antonelli2009-01-281-201/+4
|
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-1119-19/+19
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-0/+13
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-069-935/+102
|
* Second Life viewer sources 1.20.3Jacek Antonelli2008-08-151-4/+9
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-156-21/+586
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-155-693/+694
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-1519-36/+494
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-1518-18/+18
|
* 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-1518-2/+109
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-2/+10
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-152-4/+4
|
* Second Life viewer sources 1.16.0.5Jacek Antonelli2008-08-154-12/+136
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-5/+10
|
* Second Life viewer sources 1.15.0.2Jacek Antonelli2008-08-1518-81/+103
|
* Second Life viewer sources 1.14.0.0Jacek Antonelli2008-08-155-65/+405
|
* Second Life viewer sources 1.13.2.12Jacek Antonelli2008-08-1520-0/+5596
generated by cgit v1.1 at 2024-11-15 17:17:24 +0000