Shyotl e8ce35ebf8 Merge branch 'master' into UICleanup ...

Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp

2013-05-03 21:41:51 -05:00

..

aistatemachine

Derived classes may access this.

2013-04-28 03:31:16 +02:00

cmake

Add -Wno-sign-compare back.

2013-04-23 21:37:22 +02:00

copy_win_scripts

…

cwdebug

Compile bug fixes when -DDEBUG_CURLIO

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

lib/python

…

libhacd

Fixed uninitialized warning in hacd

2013-03-04 16:00:00 -05:00

libndhacd

Linux64 support, integrated physics/decomposition

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

libopenjpeg

CMake cleanup and organization

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

libpathing

Fixed windows build in debug mode

2013-04-13 22:07:45 +02:00

linux_crash_logger

…

llappearance

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

llaudio

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

llcharacter

Attempt to speed up agent idle update by optimizing wearable/visualparam related lookups/iterations a bit more.

2013-04-24 17:52:17 -05:00

llcommon

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

llcrashlogger

Pass LLControlGroup* to AICurlInterface::startCurlThread instead of each Debug Setting separately.

2013-04-26 16:47:22 +02:00

llimage

CMake cleanup and organization

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

llimagej2coj

OpenJPEG 1.5.2

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

llinventory

Fix debug permissions display to show the transfer permission again.

2013-04-13 20:01:38 +02:00

llmath

Compile fix for libcwd

2013-04-12 20:55:54 +02:00

llmessage

Fix comment.

2013-04-30 22:16:29 +02:00

llplugin

Bring back memory stat! Someone is a clobbermonster.

2013-04-23 11:46:44 +02:00

llprimitive

Clamp LLMeshSkinInfo::mJointNames to a max of 64 entries. Also checking size in lldrawpoolavatar(Redundant checks added to just match similar logic LLRiggedVolume::update more closely.)

2013-03-30 01:01:53 -05:00

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

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

llrender

UI cleanup.

2013-04-16 00:25:59 -05:00

llui

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

llvfs

Some CMake Cleanup

2013-03-04 03:31:24 -05:00

llwindow

CMake cleanup and organization

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

llxml

Minor cleanup and additional nullchecks.

2013-05-03 14:29:55 -05:00

lscript

Update LSL information (Adds new AnimationOverride)

2013-04-19 23:59:05 +02:00

mac_crash_logger

…

mac_updater

…

newview

Merge branch 'master' into UICleanup

2013-05-03 21:41:51 -05:00

plugins

Add support for uploading .anim files.

2013-04-25 19:05:52 +02:00

test

Remove LLMemType and related files

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

test_apps/llplugintest

…

tools/vstool

…

win_crash_logger

…

win_updater

…

CMakeLists.txt

Remove -Wno-sign-compare and fix DISABLE_FATAL_WARNINGS

2013-04-23 19:37:53 +02:00

develop.py

CMake cleanup and organization

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