52 Commits (61ba4b0d7705ca12b606d238d48a0b1bc370bf31)

Author	SHA1	Message	Date
Monroe Williams	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
Monroe Williams	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