Aleric Inglewood d23835a6c2 Merge remote-tracking branch 'singu/master' into curlthreading2 ...

Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.

2012-09-11 15:15:46 +02:00

..

cmake

Fix loading Qt plugin on linux standalone.

2012-09-05 19:29:47 +02:00

copy_win_scripts

…

cwdebug

Compile fix for OSX

2012-08-31 05:23:20 +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

Attempt to fix linking on newer linux

2011-12-23 18:31:47 +01:00

llaudio

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

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

llcharacter

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

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

llcommon

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

2012-09-11 15:15:46 +02:00

llcrashlogger

Fixed typo in comment

2012-07-15 16:57:47 +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

Allow super thin objects on OpenSim

2012-09-04 12:37:22 +02:00

llmessage

Only disable TLS1.1 for openssl1.0.1 and higher, leaving SSL3 alone.

2012-09-11 02:05:54 +02:00

llplugin

Bug fix.

2012-09-05 02:15:41 +02:00

llprimitive

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

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

llrender

Fix anti-aliasing in FBO mode

2012-09-08 08:09:30 +02:00

llui

Fix multi-preview for textures

2012-08-30 14:03:27 +02:00

llvfs

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

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

llwindow

Fow windows, client is now more likeley to create gl context that actually matches desired multi-sample value.

2012-09-02 08:49:46 +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 remote-tracking branch 'singu/master' into curlthreading2

2012-09-11 15:15:46 +02:00

plugins

Make webkit work with Qt 4.8

2012-09-05 04:12:13 +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 remote-tracking branch 'singu/master' into curlthreading2

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

develop.py

Removed ReleaseSSE2

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