Latif Khalifa 8584e6da4c Merge branch 'master' into meshupload ...

Conflicts:
	indra/llcommon/llhash.h
	indra/newview/CMakeLists.txt
	indra/newview/llfloatermodelpreview.cpp
	indra/newview/llfloatermodelpreview.h
	indra/newview/llpanelprofile.h

2013-01-30 00:36:31 +01:00

..

dictionaries

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

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

shaders

OSX was choking on transformfeedback shaders. Make failure to load such shaders non-critical to the shader loading process. Also clean up glColorMask state properly in wlsky.

2012-12-24 17:56:32 -06:00

windlight

A little bit of postprocess shader tinkering.

2012-12-12 03:10:05 -06:00

anim.ini

…

ao_template.ini

…

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

Fix handle_secondlifeprotocol.sh, and sync with v-d.

2012-11-06 18:50:45 -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

Complete Issue 545: OSSL Updates

2012-12-22 12:25:46 -05: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

lsl_functions_os.xml

Fix for WordFromTheWise's missing lsl strings issue.

2012-12-30 16:09:08 -05:00

lsl_functions_sl.xml

Removed lscript_compile, lscript_execute, and lscript_library dependencies from newview.

2012-09-24 04:08:57 -05: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

…

settings_ascent_coa.xml

Add MoyMiniMapCustomColor swatch to Vanity Preferences.

2013-01-03 13:59:14 -05:00

settings_ascent.xml

Make defaults less rude to others

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

settings_crash_behavior.xml

…

settings_files.xml

This should fix the settings

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

settings_per_account_ascent.xml

…

settings_per_account.xml

Add MoyMiniMapCustomColor swatch to Vanity Preferences.

2013-01-03 13:59:14 -05: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

Occlusion-fudge was incorrectly defaulting to zero.

2012-12-08 16:56:06 -06:00

settings.xml

Merge branch 'master' into meshupload

2013-01-30 00:36:31 +01:00

static_data.db2

…

static_index.db2

…

std_bump.ini

…

trees.xml

…

ultra_graphics.xml

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

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

viewerart.xml

…