Aleric Inglewood 87b8f6e076 Merge with siana/master. Resolved conflicts. ...

Conflicts: removal of trailing space (to be the same as
viewer 3) in one instance collided with a patch of Siana.

I had moved isSelfLocked.

2012-03-11 03:21:45 +01:00

..

cmake

Boost: target Windows XP strictly

2012-02-23 15:35:50 +01:00

copy_win_scripts

…

cwdebug

New libcwd debug channel CAPS.

2012-02-16 02:30:14 +01:00

lib/python

…

libopenjpeg

…

linux_crash_logger

…

llaudio

Fixies from viewer-development

2012-03-06 09:01:01 +01:00

llcharacter

…

llcommon

Merge with siana/master. Resolved conflicts.

2012-03-11 03:21:45 +01:00

llcrashlogger

…

llimage

Wholesale update of llmessage to V3.2

2012-03-06 07:31:15 +01:00

llimagej2coj

Extra info from j2c decoder in case of cache corruption

2012-02-20 03:47:06 +01:00

llinventory

Fix for libcwd

2012-02-06 22:34:34 +01:00

llmath

…

llmessage

And of course i forgot to add some files

2012-03-06 09:11:36 +01:00

llplugin

…

llprimitive

Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)

2012-02-09 14:26:21 -06:00

llrender

First shot at fixing font fallback

2012-03-05 18:18:37 +01:00

llui

LLViewerRegion WIP: brought LLTrans up to speed with V3.

2012-02-18 02:22:49 +01:00

llvfs

…

llwindow

First shot at fixing font fallback

2012-03-05 18:18:37 +01:00

llxml

…

lscript

…

mac_crash_logger

…

mac_updater

…

newview

Merge with siana/master. Resolved conflicts.

2012-03-11 03:21:45 +01:00

plugins

…

test

…

test_apps/llplugintest

…

tools/vstool

…

win_crash_logger

…

win_updater

…

CMakeLists.txt

Auto-version system

2012-02-09 14:03:49 +01:00

develop.py

…