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

..

CMakeLists.txt

Add cmake file for collada and glod.

2013-01-22 20:51:43 +01:00

legacy_object_types.h

Imported existing code

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

llmaterialtable.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

llmaterialtable.h

A few more translated tidbits. Also converted french strings.xml from BOM with windows lineendings, to non-BOM with unix lineendings.

2012-01-28 22:07:13 -06:00

llmediaentry.cpp

Further header cleanup and a few updates

2012-07-21 03:01:42 -04:00

llmediaentry.h

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

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

llmodel.cpp

Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshupload

2013-01-13 20:37:04 +01:00

llmodel.h

Initial work.

2013-01-06 03:59:38 -05:00

llprimitive.cpp

Revert changes that broke bump

2013-01-13 14:30:41 -05:00

llprimitive.h

Revert changes that broke bump

2013-01-13 14:30:41 -05:00

llprimlinkinfo.h

Imported existing code

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

llprimtexturelist.cpp

V2 llprimitive merge

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

llprimtexturelist.h

V2 llprimitive merge

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

lltextureanim.cpp

'Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.' https://bitbucket.org/davep/shining-fixes/changeset/db8a3f49c250

2011-11-23 23:44:04 -06:00

lltextureanim.h

Imported existing code

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

lltextureentry.cpp

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lltextureentry.h

Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)

2013-01-07 14:44:54 -06:00

lltree_common.h

Imported existing code

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

lltreeparams.cpp

Imported existing code

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

lltreeparams.h

Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights

2012-01-09 05:40:03 -05:00

llvolumemessage.cpp

Reasonably safe changes.

2011-05-18 14:35:27 -05:00

llvolumemessage.h

Reasonably safe changes.

2011-05-18 14:35:27 -05:00

llvolumexml.cpp

Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)

2012-02-09 14:26:21 -06:00

llvolumexml.h

Renderer update. Incl mac fixes, DoF improvements, windlight floater code cleanup. (shining-fixes merge)

2012-02-09 14:26:21 -06:00

material_codes.cpp

V2 llprimitive merge

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

material_codes.h

V2 llprimitive merge

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

object_flags.h

Implemented basic 'awareness' of objects flagged as permanent.

2012-08-04 20:46:51 -05:00