Shyotl b887d3147e Merge branch 'master' of git://github.com/siana/SingularityViewer.git ...

Conflicts:
	indra/llrender/llglstates.h

2011-03-25 17:54:52 -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

OpenJPEG fix thx to impru team

2010-12-30 00:18:14 +01: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

JointMesh face update optimization

2011-03-15 05:13:06 -05:00

llcrashlogger

Imported existing code

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

llimage

OpenJPEG experiment, PCH circumcision

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

llimagej2coj

OpenJPEG experiment, PCH circumcision

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

llinventory

V2 llmath merge part 2

2011-02-23 01:40:47 -06:00

llmath

Null checks, initilizations, etc

2011-03-05 18:00:16 -06: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

V2 llprimitive merge

2011-02-23 01:44:31 -06:00

llrender

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

2011-03-25 17:54:52 -05:00

llui

The Octopus Feature

2011-03-24 23:54:23 +01:00

llvfs

Now using a buffer for debug console output. No longer bog-slow on windows if the console is enabled.

2011-02-28 01:38:05 -06:00

llwindow

Linux version

2011-01-04 02:00:25 +01:00

llxml

The Octopus Feature

2011-03-24 23:54:23 +01: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

Fixed mis-matching arguments

2011-02-02 17:06:03 -07:00

newview

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

2011-03-25 17:54:52 -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

Backwards compatability for pre VC9 installs lacking updated resource compiler. (Uses pre-vista icon format)

2011-02-15 17:17:45 -06: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