Aleric Inglewood 4cd7dec92b Merge branch 'master' into curlthreading4 ...

Conflicts:
	indra/aistatemachine/aistatemachine.cpp
	indra/aistatemachine/aistatemachine.h
	indra/llmessage/aicurleasyrequeststatemachine.cpp

2013-03-06 03:34:05 +01:00

..

aistatemachine

Rewrite of AIStateMachine, version 2.

2013-03-06 03:26:43 +01:00

cmake

Package glod and colladadom dlls

2013-01-30 05:43:17 +01:00

copy_win_scripts

…

cwdebug

Compile bug fixes when -DDEBUG_CURLIO

2013-02-12 23:44:55 +01:00

lib/python

Removed ReleaseSSE2

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

libhacd

Temporarily disable HACD file save functions (not used) to avoid strange linking issue on windows

2013-01-30 05:25:05 +01:00

libndhacd

Linux64 support, integrated physics/decomposition

2013-01-13 03:23:56 +01:00

libopenjpeg

Take out buggy padding removal in OJ

2013-01-06 04:01:28 +01:00

libpathing

Linux64 support, integrated physics/decomposition

2013-01-13 03:23:56 +01:00

linux_crash_logger

Attempt to fix linking on newer linux

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

llappearance

Merged some alignment adjustments from sunshine-external

2013-02-12 14:52:53 -06:00

llaudio

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llcharacter

Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00

llcommon

Rewrite of AIStateMachine, version 2.

2013-03-06 03:26:43 +01:00

llcrashlogger

Add getName() to every non-base class Responder object.

2013-01-11 04:15:55 +01:00

llimage

Merge branch 'master' into sunshine

2013-01-08 17:05:29 -06:00

llimagej2coj

OpenJPEG 1.5.2

2012-12-09 02:10:16 +01:00

llinventory

Add support for two non-SL grid features/flags.

2013-02-11 01:14:09 -05:00

llmath

Merge remote-tracking branch 'shyotl/sunshine'

2013-01-21 11:25:10 +01:00

llmessage

Merge branch 'master' into curlthreading4

2013-03-06 03:34:05 +01:00

llplugin

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llprimitive

Fix windows build: warnings management

2013-01-30 05:45:00 +01:00

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

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

llrender

Some cleanup missed in merge.

2013-01-08 17:07:05 -06:00

llui

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

2013-02-17 15:40:27 +01:00

llvfs

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llwindow

Try to fix long-standing crash-on-resize in Linux.

2013-01-27 01:41:17 +01:00

llxml

Minor adjsutment to llcontrolgroup. Demote non-critical failure from llerrs to llwarns.

2013-02-12 14:53:56 -06:00

lscript

missed another spot with trailing spaces in aa functions, TNX LightDrake and Shyot1 :)

2012-11-14 21:37:36 -05:00

mac_crash_logger

…

mac_updater

…

newview

Merge branch 'master' into curlthreading4

2013-03-06 03:34:05 +01:00

plugins

Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT

2013-01-07 20:11:18 +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' into meshupload

2013-01-30 00:36:31 +01:00

develop.py

Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

2013-01-05 20:50:49 -05:00