Shyotl 794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit ...

Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp

2012-11-29 11:54:41 -06:00

..

aistatemachine

AIStateMachine::flush can only make statemachines idle.

2012-11-07 01:53:12 +01:00

cmake

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

copy_win_scripts

…

cwdebug

Various stuff

2012-09-24 16:55:34 +02:00

lib/python

Removed ReleaseSSE2

2012-07-04 10:25:04 +00:00

libopenjpeg

…

linux_crash_logger

…

llaudio

Merge remote-tracking branch 'singu/master' into curlthreading2

2012-09-04 17:38:11 +02:00

llcharacter

Fast Timers brought up to linden equiv

2012-09-14 00:30:52 -04:00

llcommon

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llcrashlogger

Code cleanup

2012-10-31 23:11:42 +01:00

llimage

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llimagej2coj

Add NickyD's fast j2k metadata reader

2012-11-13 05:38:27 +01:00

llinventory

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00

llmath

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llmessage

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

2012-11-23 03:19:39 +01:00

llplugin

Revert "Probably antivirus-friendlier SLPlugin"

2012-11-13 18:41:58 +01:00

llprimitive

Dragged in a bunch of alignment fixes from LL. Should allow disabling of tcmalloc on windows/linux32 if such is ever implemented.

2012-10-16 02:33:05 -05:00

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

2012-11-23 03:19:39 +01:00

llrender

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llui

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llvfs

Cmake changes needed for standalone

2012-09-07 17:53:13 -04:00

llwindow

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llxml

Fix LL_REF_COUNT_DEBUG debug code.

2012-08-09 07:00:51 +02:00

lscript

Fixed lscript

2012-09-05 21:42:51 -05:00

mac_crash_logger

…

mac_updater

…

newview

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

plugins

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

2012-11-12 06:46:58 +01:00

test

Removed dead code.

2012-07-23 18:15:11 +02:00

test_apps/llplugintest

General cleanup of OSX support - not done

2012-07-15 17:45:50 -04:00

tools/vstool

…

win_crash_logger

…

win_updater

…

CMakeLists.txt

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

2012-11-12 06:46:58 +01:00

develop.py

TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON

2012-10-16 17:15:23 -05:00