Aleric Inglewood d23835a6c2 Merge remote-tracking branch 'singu/master' into curlthreading2 ...

Conflicts:
	indra/newview/statemachine/aistatemachine.cpp

Huh - you re-INDENTED a file that you didn't merge yet?
How about merging curlthreading2 and curlthreading3
before doing THAT? :/

Obviously I did an "use ours" here.

2012-09-11 15:15:46 +02:00

..

dictionaries

Added new LSL constants (keywords). OBJECT_SCRIPT_TIME, PARCEL_DETAILS_ID, etc

2011-09-02 04:07:39 -05:00

shaders

ivec4 still needed as texture index on some SONY VAIO and Toshiba ATI drivers.

2012-09-02 19:26:28 +02:00

windlight

Stricter git

2012-08-21 19:17:45 +02:00

anim.ini

Imported existing code

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

ao_template.ini

Whoops, missing AO files

2011-03-01 06:21:21 +01:00

CA.pem

Certificate update

2012-07-03 07:51:03 +02:00

client_tags_sg1.xml

Add Voodoo to tags.

2012-07-16 19:33:44 -04:00

cmd_line.xml

Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred.

2011-05-28 01:46:11 -05:00

default_grids.xml

Added OSGrid

2012-08-31 06:36:47 +02:00

grass.xml

Fix the grass.xml so that they don't have odd names that show up in the UI.

2011-10-04 06:08:32 +02:00

high_graphics.xml

Enable Hardware Skinning by default for med/high/ultra settings.

2012-01-28 22:11:51 -06:00

keys.ini

Renewed support for / starting chat on linux.

2012-02-06 15:30:27 -05:00

keywords.ini

Updated LSL Funtions

2012-08-02 05:38:23 -04:00

logcontrol.xml

Add more support for debugging plugins.

2011-05-08 17:49:06 +02:00

low_graphics.xml

Enable Hardware Skinning by default for med/high/ultra settings.

2012-01-28 22:11:51 -06:00

mid_graphics.xml

Enable Hardware Skinning by default for med/high/ultra settings.

2012-01-28 22:11:51 -06:00

mime_types.xml

Apparently some of those is needed on Windows, and it was shoddy

2011-05-08 00:51:00 +02:00

settings_ascent_coa.xml

Auto detach Firestorm bridge

2012-08-14 08:11:15 +02:00

settings_ascent.xml

Make defaults less rude to others

2012-07-10 05:50:47 +02:00

settings_crash_behavior.xml

Remove CR from configuration, source and xml files.

2011-05-01 22:16:05 +02:00

settings_files.xml

This should fix the settings

2011-08-11 00:53:17 +02:00

settings_per_account_ascent.xml

COA stuff rolled into gSavedSettings.

2010-10-19 18:50:47 -05:00

settings_per_account.xml

Fix for log file name with datestamp checkbox on Comm Prefs Panel never enabling, and thus being intangible.

2012-07-27 12:55:13 -04:00

settings_rlv.xml

RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.

2012-04-12 10:29:45 -05:00

settings_sh.xml

Remove old spam stuffs, Clean up new spam stuffs to compile, UI new spam stuffs.

2012-07-19 23:40:07 -04:00

settings.xml

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

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

static_data.db2

Static VFS from V2 - incl new walks!

2011-03-11 00:20:18 +01:00

static_index.db2

Static VFS from V2 - incl new walks!

2011-03-11 00:20:18 +01:00

std_bump.ini

Imported existing code

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

trees.xml

Played with trees!

2010-11-17 03:51:58 -06:00

ultra_graphics.xml

Enable Hardware Skinning by default for med/high/ultra settings.

2012-01-28 22:11:51 -06:00

viewerart.xml

Imported existing code

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