Shyotl 5954e0d71c Merge branch 'master' into V2TextureSystem ...

Conflicts:
	indra/newview/llfloaterexport.cpp

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

..

cmake

Unbotch jsoncpp

2011-03-21 04:17:00 +01:00

copy_win_scripts

Branding pt2

2010-11-15 10:45:16 +01:00

lib/python

Fix default channel branding

2011-02-02 18:06:42 -07:00

libopenjpeg

Revert "OpenJPEG 1.4 stable"

2011-04-09 20:29:12 +02:00

linux_crash_logger

ld.gold on linux, useless spam

2010-11-13 04:45:10 +01:00

llaudio

V2 llaudio merge

2011-02-21 02:02:24 -06:00

llcharacter

Misc llcommon tidbits from v2.

2011-03-15 02:33:55 -05:00

llcommon

Version 1.5.6(1)

2011-04-09 22:57:39 +02:00

llcrashlogger

Imported existing code

2010-04-02 02:48:44 -03:00

llimage

Merge branch 'master' into V2TextureSystem

2011-04-12 22:29:49 -05:00

llimagej2coj

OpenJPEG experiment, PCH circumcision

2011-03-20 04:44:58 +01:00

llinventory

Removed crash vulnerability to malevolently malformed notecards.

2011-04-21 00:17:10 -05:00

llmath

Merge branch 'master' into V2TextureSystem

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

llmessage

Merge git://github.com/Shyotl/SingularityViewer

2011-03-25 03:41:11 +01:00

llplugin

Emerald Local Assets

2011-03-03 03:30:58 +01:00

llprimitive

Minor tweaks of little consequence. Nullcheck, overrun paranoia.

2011-04-16 18:21:38 -05:00

llrender

Merge branch 'V2Renderer' into V2TextureSystem

2011-04-23 19:33:20 -05:00

llui

Merge branch 'V2Renderer' into V2TextureSystem

2011-04-23 19:33:20 -05:00

llvfs

How about i read before i commit? Fixes PerAccount dir

2011-04-01 20:50:44 +02:00

llwindow

Bringing in-line with V2. mbstowcs->MultiByteToWideChar, ancient comment removal, fullscreen behavior check...

2011-04-23 01:01:55 -05:00

llxml

Local-lights now display in deferred

2011-04-20 20:08:42 -05:00

lscript

Added absent lsl functions to the lsl function dictionary

2011-02-11 18:21:47 -06:00

mac_crash_logger

Imported existing code

2010-04-02 02:48:44 -03:00

mac_updater

Goodbye updater

2011-01-25 05:50:49 +01:00

media_plugins

Hopefully fixed quicktime sdk conflict with boost as well as vc100

2011-03-28 23:51:55 -05:00

newview

Merge branch 'master' into V2TextureSystem

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

test

Imported existing code

2010-04-02 02:48:44 -03:00

test_apps

Our media system has changed, so should the test

2010-12-28 17:08:23 +01:00

tools/vstool

VC2010 cmake alterations. Lib stuff not included.

2010-10-05 01:34:35 -05:00

win_crash_logger

Imported existing code

2010-04-02 02:48:44 -03:00

win_updater

Imported existing code

2010-04-02 02:48:44 -03:00

CMakeLists.txt

Singularity 1.5.4(2) fixes

2011-02-21 15:15:55 +01:00

develop.py

Fixed searching for Visual Studio Express versions

2011-04-16 15:56:15 -04:00

fmodfilestructure.zip

Custom NSI installer template added to fmodfilestructure.zip, goes into \indra\build-VC80\newview\release

2010-08-23 00:35:10 -04:00