Bryan O'Sullivan b806edf4ac Redo Bao's broken merge		2009-11-04 14:59:23 -08:00
..
tests	Redo Bao's broken merge	2009-11-04 14:59:23 -08:00
CMakeLists.txt	svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7	2009-10-01 02:35:53 +00:00
legacy_object_types.h	…
llmaterialtable.cpp	…
llmaterialtable.h	…
llmediaentry.cpp	Redo Bao's broken merge	2009-11-04 14:59:23 -08:00
llmediaentry.h	svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7	2009-10-01 02:35:53 +00:00
llprimitive.cpp	merge of latest viewer/viewer-20	2009-10-02 10:35:42 -07:00
llprimitive.h	svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3	2009-10-16 21:41:31 +00:00
llprimlinkinfo.h	…
llprimtexturelist.cpp	…
llprimtexturelist.h	…
lltextureanim.cpp	…
lltextureanim.h	…
lltextureentry.cpp	Merged latest viewer/login-api with latest viewer/viewer-20	2009-10-07 17:51:28 -07:00
lltextureentry.h	FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URL	2009-10-05 18:14:27 -07:00
lltree_common.h	…
lltreeparams.cpp	…
lltreeparams.h	…
llvolumemessage.cpp	…
llvolumemessage.h	…
llvolumexml.cpp	…
llvolumexml.h	…
material_codes.h	…
object_flags.h	…