svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7

etc/message.xml

indra/llcommon/lllslconstants.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginmessage.cpp

indra/llplugin/llpluginmessage.h

indra/llplugin/llpluginprocesschild.cpp

indra/llplugin/llpluginprocesschild.h

indra/llplugin/llpluginprocessparent.cpp

indra/llplugin/llpluginprocessparent.h

indra/llprimitive/CMakeLists.txt

indra/llprimitive/llmediaentry.cpp

indra/llprimitive/llmediaentry.h

indra/llprimitive/llprimitive.cpp

indra/llprimitive/lltextureentry.cpp

indra/llprimitive/lltextureentry.h

indra/llprimitive/tests/llmediaentry_test.cpp

indra/llvfs/lldir_linux.cpp

indra/llvfs/lldir_mac.cpp

indra/llvfs/lldir_win32.cpp