Shyotl 54771409d6 Merge branch 'master' into sunshine ...

Conflicts:
	indra/llimage/llimage.cpp
	indra/llui/llui.cpp
	indra/newview/llvoavatar.cpp

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

..

aistatemachine

AIStateMachine::flush can only make statemachines idle.

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

cmake

Merge branch 'master' into sunshine

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

copy_win_scripts

…

cwdebug

Add filtering for curl debug output.

2012-12-24 02:54:36 +01:00

lib/python

Removed ReleaseSSE2

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

libopenjpeg

Blind Windows compile fix

2012-12-09 04:53:35 +01:00

linux_crash_logger

…

llappearance

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -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

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

llcommon

Merge branch 'master' into sunshine

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

llcrashlogger

Code cleanup

2012-10-31 23:11:42 +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

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

llmath

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

llmessage

Merge branch 'master' into sunshine

2013-01-08 17:05:29 -06: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

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

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

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

llrender

Merge branch 'master' into sunshine

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

llui

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06: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

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

llxml

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

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 sunshine

2013-01-08 17:05:29 -06: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

…

win_updater

…

CMakeLists.txt

Created llappearance project. Migrated llvoavatardefines and llwearabletype.

2012-12-20 00:00:17 -06:00

develop.py

TCMalloc can now be manually disabled via develop.py -DDISABLE_TCMALLOC:BOOL=ON

2012-10-16 17:15:23 -05:00