Shyotl b865b92a6a Merge branch 'FMODStudio' ...

Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN

2015-01-26 17:15:46 -06:00

..

slplugin

Doge wuz here. Also barkies.

2015-01-13 17:31:20 -05:00

CMakeLists.txt

WIP[win64]: it builds, runs. webkit disabled in cmake for now

2013-10-20 17:03:48 +02:00

llpluginclassbasic.cpp

Webkit plugin updates

2012-07-06 11:37:45 +00:00

llpluginclassbasic.h

Webkit plugin updates

2012-07-06 11:37:45 +00:00

llpluginclassmedia.cpp

Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent).

2013-06-02 23:47:47 -05:00

llpluginclassmedia.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

llpluginclassmediaowner.h

Webkit plugin updates

2012-07-06 11:37:45 +00:00

llplugincookiestore.cpp

Fixed web browser thanks to ArminW/Imprudence

2010-12-24 22:23:32 +01:00

llplugincookiestore.h

Fixed web browser thanks to ArminW/Imprudence

2010-12-24 22:23:32 +01:00

llplugininstance.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

llplugininstance.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

llpluginmessage.cpp

Fix underlinkage of libmedia_plugin_webkit.so

2011-05-02 23:13:15 +02:00

llpluginmessage.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

llpluginmessageclasses.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

llpluginmessagepipe.cpp

Linux build pass.

2014-12-08 18:46:15 -06:00

llpluginmessagepipe.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

llpluginprocesschild.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

llpluginprocesschild.h

Webkit plugin updates

2012-07-06 11:37:45 +00:00

llpluginprocessparent.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

llpluginprocessparent.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

llpluginsharedmemory.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

llpluginsharedmemory.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