Andros Baphomet 7ab20726e4 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	indra/llrender/llshadermgr.cpp (resolved)

2013-10-06 10:32:23 -04:00

..

aistatemachine

Documentation update.

2013-08-02 13:04:56 +02:00

cmake

Merge branch 'boost152'

2013-10-06 08:13:31 +02:00

copy_win_scripts

…

cwdebug

Need to export BackTrace::S_Number to use BACKTRACE.

2013-06-17 17:28:42 +02:00

lib/python

…

libhacd

Forgotten file and fix

2013-05-11 21:46:41 +02:00

libndhacd

Sanitize cmake, cleanup develop.py

2013-05-06 06:07:23 +02:00

libopenjpeg

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

libpathing

Compile fix for libcwd.

2013-05-25 03:19:33 +02:00

llappearance

First attempt to deal with broken (pre multiwear) inventory items.

2013-08-18 02:50:31 +02:00

llaudio

Don't crash when chanelp returned is null

2013-09-17 01:48:11 +02:00

llcharacter

Merge branch 'VarRegion' of https://github.com/Lirusaito/SingularityViewer into aurora-sim

2013-09-27 09:51:39 -04:00

llcommon

Merge branch 'boost152'

2013-10-06 08:13:31 +02:00

llimage

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

llimagej2coj

Texfetch/cache changes:

2013-09-23 17:19:44 -05:00

llinventory

First attempt to deal with broken (pre multiwear) inventory items.

2013-08-18 02:50:31 +02:00

llmath

Re initiate spatial partitions in the main region after a long teleport jump.

2013-09-12 09:42:55 +02:00

llmessage

Revert "Harden agains network packet overruns"

2013-10-05 04:31:57 -04:00

llplugin

Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).

2013-06-02 23:47:47 -05:00

llprimitive

Crash fixes to deal with janky FBX to DAE converters

2013-08-25 03:02:40 -04:00

llqtwebkit

…

llrender

Merge remote-tracking branch 'upstream/master'

2013-10-06 10:32:23 -04:00

llui

Address Issue 352: Ctrl-Backspace in editable text fields

2013-09-29 19:14:56 -04:00

llvfs

Boost throws exceptions

2013-10-06 08:11:07 +02:00

llwindow

Improved X log parser to handle VirtualGL systems, removed old X log parser

2013-10-02 21:35:17 -04:00

llxml

Wearable export improvements.

2013-07-19 21:22:59 +02:00

lscript

Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on)

2013-07-17 12:59:01 -04:00

newview

Merge remote-tracking branch 'upstream/master'

2013-10-06 10:32:23 -04:00

plugins

Fix /singularity/singularity-master/indra/plugins/filepicker/llfilepicker.cpp:762:61: warning: multi-character character constant

2013-10-03 13:20:47 -04:00

test

Remove LLMemType and related files

2013-03-04 12:02:01 -05:00

test_apps/llplugintest

…

tools/vstool

Revert the last change of VSTool.exe

2013-05-24 06:00:22 +02:00

CMakeLists.txt

Breakpad: Commence nuclear bombardment of the unused stuff

2013-10-01 23:41:38 +02:00

develop.py

Sanitize cmake, cleanup develop.py

2013-05-06 06:07:23 +02:00