Siana Gearz 303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer ...

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp

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

..

aistatemachine

AIStateMachine::flush can only make statemachines idle.

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

cmake

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

2012-11-12 06:46:58 +01: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

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

Fast Timers brought up to linden equiv

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

llcommon

Add fasttimers around obtaining a mutex or waiting on a condition.

2012-11-10 02:33:48 +01:00

llcrashlogger

Code cleanup

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

llimage

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

2012-11-12 06:46:58 +01: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

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

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

llmessage

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

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

llplugin

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

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

llprimitive

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

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

llqtwebkit

Initial llqtwebkit

2012-09-08 02:03:07 -04:00

llrender

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

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

llui

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

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

llvfs

Cmake changes needed for standalone

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

llwindow

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

2012-11-12 06:46:58 +01: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 git://github.com/Lirusaito/SingularityViewer

2012-11-12 06:46:58 +01: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

LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from

2011-05-15 22:50:56 -05:00

win_updater

…

CMakeLists.txt

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

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

develop.py

Removed ReleaseSSE2

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