Lirusaito fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp

2013-06-11 15:32:18 -04:00

..

CMakeLists.txt

CMake cleanup and organization

2013-03-05 12:24:51 -05: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

OS X build fix

2013-05-28 03:24:12 +02:00

llmodel.h

Initial work.

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

llprimitive.cpp

Remove LLMemType and related files

2013-03-04 12:02:01 -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

Remove LLMemType and related files

2013-03-04 12:02:01 -05: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

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

lltextureentry.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05: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