Aleric Inglewood 0b86c9eec1 Merge remote-tracking branch 'singu/master' ...

Conflicts:
	indra/newview/llviewerwindow.cpp

c_str() dropped out (50f03d83c0).
Added it back.

2013-04-20 05:18:27 +02:00

..

aistatemachine

Merge remote-tracking branch 'singu/master'

2013-04-20 05:18:27 +02:00

cmake

Merge commit 'e9330f8a8752d6b6effce438204cd0d2e69a1d0f'

2013-04-09 19:56:55 +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

SH-4059 FIX other's hover parameters affects your avatar's setting

2013-04-05 23:10:17 +02:00

llaudio

Import some changes from internal

2013-03-12 06:03:06 -04:00

llcharacter

CMake cleanup and organization

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

llcommon

Merge remote-tracking branch 'singu/master'

2013-04-20 05:18:27 +02:00

llcrashlogger

PerHost became PerService

2013-04-09 05:06:32 +02:00

llimage

CMake cleanup and organization

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

llimagej2coj

…

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

Rename HTTPTimeout::sClockCount (in clock ticks) to sTime_10ms (in 10ms units).

2013-04-09 22:27:23 +02: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

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

…

llrender

Fix some subtle bugs in llrender.

2013-04-15 18:10:38 -05:00

llui

Merge remote-tracking branch 'shyotl/master'

2013-04-16 06:36:13 +02: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

Fixed non-debug compile.

2013-03-24 23:20:40 -05:00

lscript

Update LSL information (Adds new AnimationOverride)

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

mac_crash_logger

…

mac_updater

…

newview

Merge remote-tracking branch 'singu/master'

2013-04-20 05:18:27 +02:00

plugins

General cleanup of unused variable warnings

2013-03-04 16:04:05 -05: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

Some CMake Cleanup

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

develop.py

CMake cleanup and organization

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