Aleric Inglewood db17b93156 Merge branch 'master' into meshupload ...

Conflicts:
	indra/newview/llmeshrepository.cpp

Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.

2013-01-13 17:59:49 +01:00

..

aistatemachine

AIStateMachine::flush can only make statemachines idle.

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

cmake

Minor fix to OSX

2013-01-07 22:11:19 -05:00

copy_win_scripts

…

cwdebug

New debug channel dc::snapshot.

2013-01-09 00:54:53 +01:00

lib/python

Removed ReleaseSSE2

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

libopenjpeg

Take out buggy padding removal in OJ

2013-01-06 04:01:28 +01:00

linux_crash_logger

…

llaudio

Merge remote-tracking branch 'singu/master' into curlthreading2

2012-09-04 17:38:11 +02:00

llcharacter

In FreezeTime mode, keep avatars that TP away.

2012-12-16 00:13:06 +01:00

llcommon

Merge branch 'master' into meshupload

2013-01-13 17:59:49 +01:00

llcrashlogger

Add getName() to every non-base class Responder object.

2013-01-11 04:15:55 +01:00

llimage

Merge branch 'master' into llwebprofile

2012-12-14 20:43:17 +01:00

llimagej2coj

OpenJPEG 1.5.2

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

llinventory

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00

llmath

Disable octree statistics gathering.

2012-12-08 17:07:15 -06:00

llmessage

Temporary workaround for release.

2013-01-13 02:18:00 +01:00

llplugin

Revert "Probably antivirus-friendlier SLPlugin"

2012-11-13 18:41:58 +01:00

llprimitive

Initial work.

2013-01-06 03:59:38 -05:00

llqtwebkit

Compile error and warning fixes for DEBUG_CURLIO without CWDEBUG.

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

llrender

Removing leftover dead code

2012-12-28 21:07:19 +01:00

llui

Fixed LLUploadDialog to display it's text.

2013-01-10 18:48:02 +01:00

llvfs

Cmake changes needed for standalone

2012-09-07 17:53:13 -04:00

llwindow

Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit

2012-11-29 11:54:41 -06:00

llxml

Do not use LLCachedControl as global variables.

2013-01-03 23:25:18 +01: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 meshupload

2013-01-13 17:59:49 +01:00

plugins

Renamed FFLOAD/SAVE_LSL to FFLOAD/SAVE_SCRIPT

2013-01-07 20:11:18 +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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

2012-11-12 06:46:58 +01:00

develop.py

Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

2013-01-05 20:50:49 -05:00