livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Steven Bennetts a1ed9ccf73 Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
 		2009-08-29 06:23:41 +00:00
..
cmake DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro. 2009-08-28 19:13:13 +00:00
copy_win_scripts QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
integration_tests svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6 2009-08-21 21:52:21 +00:00
lib/python Adding back the setting of "DEBUG", the lack of which caused many unit 2009-05-19 15:19:39 +00:00
linux_crash_logger svn merge -r113780:113785 2009-03-09 23:42:07 +00:00
linux_updater Some linux updater warning fixes for fussy futuristic gcc versions! 2009-08-24 15:37:31 +00:00
llaudio svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llcharacter merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llcommon Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
llcrashlogger merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llimage merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llimagej2coj merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llinventory svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llmath svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llmessage DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro. 2009-08-28 19:13:13 +00:00
llplugin svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llprimitive merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llrender svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llui svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 2009-08-28 22:58:17 +00:00
llvfs Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
llwindow svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
llxml merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llxuixml merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
lscript Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
mac_crash_logger svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
mac_updater svn merge -r117314:117337 2009-04-16 23:45:35 +00:00
media_plugins svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5 2009-08-29 01:08:36 +00:00
newview Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
test Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2. 2009-07-16 17:54:58 +00:00
test_apps/llplugintest svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
tools/vstool DEV-16502 - Cleaned up error messages, better error handling in vstool/main.cs 2008-06-25 17:56:53 +00:00
win_crash_logger merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
win_updater svn merge -r121194:121210 2009-05-22 09:58:47 +00:00
CMakeLists.txt svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
develop.py svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00