viewer.git - Megapahit's fork of the Second Life viewer.

Age	Commit message (Collapse)	Author
2009-09-16	DEV-31898: merging the fix for this bug into viewer-2.0.0-3 so that it	Martin Reddy
	will be available in our next public release. The server part of the fix missed 1.30, but should (hopefully) get into 1.32. Original fix was reviewed by soft and kelly.
2009-02-24	merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk	Kelly Washington

2008-09-23	QAR-849 merge maint-viewer-10-merge 96838-97237 -> release	Steven Bennetts

2008-09-12	QAR-855 Viewer 1.21 RC 2	Steven Bennetts
	merge viewer_1-21 94770-96059 -> release
2008-08-13	QAR-782 Merge featurettes batch #2	Steven Bennetts
	merge featurettes-6-merge-2 -> release dataserver-is-deprecated
2008-05-11	QAR-566 maint-viewer-5-merge-2	Steven Bennetts
	Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2 Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-04-03	svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release	Kelly Washington
	HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448
2008-03-19	QAR-377 maintenance-6 merge:	Brian McGroarty
	svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-10	QAR-345 merge windlight scriptglow3 into release	Brad Kittenbrink
	Qarl's viewer and simulator patch to add glow functionality to llGetPrimitiveParams/llSetPrimitiveCommands svn merge -r 81743:81787 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_scriptglow3_r81714
2008-02-14	svn merge -r 79730:79944 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it.
2007-09-13	svn merge -r 68690:69597 ↵	Josh Bell
	svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release Merge patches made in the 1-18-3 RC iterations into the trunk. NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
2007-07-26	merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2	Kelly Washington

2007-05-23	svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵	Brad Kittenbrink
	svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-08	svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into ↵	Don Kjer
	release
2007-03-28	Added highlighting for parcel flag object entry constants	Kyle Machulis

2007-03-16	merge -r 59028:59178 maintenance -> release.	Steven Bennetts

2007-01-02	Print done when done.	James Cook