Aleric Inglewood 536cb6febd Merge branch 'curlthreading2' into curlthreading3 ...

Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp

2012-08-15 00:51:40 +02:00

..

aistatemachine

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

cmake

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

copy_win_scripts

…

cwdebug

Compile fix for DEBUG_CURLIO

2012-08-12 17:42:30 +02:00

lib/python

Removed ReleaseSSE2

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

libopenjpeg

Remove compiler warning 'cast from pointer to integer of different size'.

2012-01-22 01:50:25 +01:00

linux_crash_logger

…

llaudio

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

2012-08-13 17:07:25 +02:00

llcharacter

Merge branch 'future' of https://github.com/Shyotl/SingularityViewer

2012-08-09 02:11:14 +02:00

llcommon

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llcrashlogger

Change mainloop to no longer use gIdleCallbacks

2012-07-29 01:30:11 +02:00

llimage

Refurbish last merge. Fix compile for standalone and libcwd.

2012-08-13 19:30:35 +02:00

llimagej2coj

Lindie viewer-dev catchup regarding rendering pipeline.

2012-06-30 20:05:31 -05:00

llinventory

Further header cleanup and a few updates

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

llmath

Fixed GCC47 issues and fmodex copying

2012-08-09 10:56:29 -04:00

llmessage

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llplugin

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llprimitive

Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-08-09 00:42:23 +02:00

llrender

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

2012-08-10 23:39:06 -04:00

llui

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llvfs

Avoid dead lock in LLQueuedThread::generateHandle / LLTextureFetchWorker::callbackDecoded

2012-07-22 04:13:23 +02:00

llwindow

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llxml

Fix LL_REF_COUNT_DEBUG debug code.

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

lscript

Updated LSL Funtions

2012-08-02 05:38:23 -04:00

mac_crash_logger

…

mac_updater

…

newview

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

plugins

Refurbish last merge. Fix compile for standalone and libcwd.

2012-08-13 19:30:35 +02: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 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

develop.py

Removed ReleaseSSE2

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