4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
cf9239cabc
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
...
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
65d8a5a11b
Changed win32 generation of initial 'component_path' for webkit plugin.
...
DllMain() captures module handle.
Call to GetModuleFilePathA() gets the dll filepath, Filename is trimmed off.
2009-09-28 17:57:51 -07:00
158946668a
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
...
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
558897b4b9
svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
...
In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-29 01:08:36 +00:00
745845f799
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
...
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Mark Palange (Mani)