unknown 25190a6d8a Merge remote branch 'Ascent/master' ...

Conflicts:
	indra/llaudio/llaudioengine.cpp
	indra/llcommon/llqueuedthread.cpp
	indra/llimage/llimage.cpp
	indra/llimage/llimagepng.cpp
	indra/llimage/llimagepng.h
	indra/llimagej2coj/llimagej2coj.cpp
	indra/llrender/llimagegl.cpp
	indra/llrender/llrender.cpp
	indra/newview/ascentprefssys.cpp
	indra/newview/ascentprefsvan.cpp
	indra/newview/gpu_table.txt
	indra/newview/llfloaterauction.cpp
	indra/newview/llsavedsettingsglue.cpp
	indra/newview/llsavedsettingsglue.h
	indra/newview/llstartup.cpp
	indra/newview/llviewercontrol.cpp
	indra/newview/llviewercontrol.h
	indra/newview/llvoavatar.cpp
	indra/newview/pipeline.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml

2010-10-11 07:01:10 -05:00

..

cmake

More vc2010 stuff (part deux)

2010-10-07 21:23:50 -05:00

copy_win_scripts

Bunch of fixes from Shyotl

2010-10-02 17:10:46 -04:00

lib/python

-Screwed around with SSE2.

2010-10-02 02:13:17 -05:00

linux_crash_logger

Imported existing code

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

llaudio

Merge remote branch 'Ascent/master'

2010-10-11 07:01:10 -05:00

llcharacter

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

llcommon

Merge remote branch 'Ascent/master'

2010-10-11 07:01:10 -05:00

llcrashlogger

Imported existing code

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

llimage

Merge remote branch 'Ascent/master'

2010-10-11 07:01:10 -05:00

llimagej2coj

Happy now, GCC?

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

llinventory

THE BIGGIE.

2010-09-22 06:48:48 -04:00

llmath

-Screwed around with SSE2.

2010-10-02 02:13:17 -05:00

llmessage

VC2010 cmake alterations. Lib stuff not included.

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

llplugin

Imported existing code

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

llprimitive

New color tag system is basically in, but commented out. Color works, but takes a while to update for the user.

2010-09-03 16:38:05 -04:00

llrender

Merge remote branch 'Ascent/master'

2010-10-11 07:01:10 -05:00

llui

Converted frequently occuring setting lookups to LLCachedControl

2010-10-07 21:36:13 -05:00

llvfs

Git is hard. Let's go shopping. (Branding changes, minor cleanup, cache isolated, new Vorbis libs in install.xml)

2010-09-26 22:54:00 -07:00

llwindow

Fixed the History and Teleport panels in Instant Messages.

2010-08-22 22:22:24 -04:00

llxml

-Moved LLCachedControl stuff to llxui/llcontrol.h to ease usage in other projects.

2010-10-11 04:08:24 -05:00

lscript

-Sanity checks from snowglobe. ...

2010-10-01 22:51:50 -04:00

mac_crash_logger

Imported existing code

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

mac_updater

Imported existing code

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

media_plugins

Imported existing code

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

newview

Merge remote branch 'Ascent/master'

2010-10-11 07:01:10 -05:00

test

Imported existing code

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

test_apps

f

2010-08-22 15:14:30 -04: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

-Screwed around with SSE2.

2010-10-02 02:13:17 -05:00

develop.py

VC2010 cmake alterations. Lib stuff not included.

2010-10-05 01:34:35 -05: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