17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
dbb67c326f
merge
2013-10-14 14:17:54 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
1bdf5ae871
MAINT-2386 Update group information before sending invite
2013-07-16 21:09:53 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
432e243e1a
EXT-1352 Add image art to floater backgrounds.
...
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now lives
in floater.xml, not as a global saved setting. Reviewed with Richard.
2009-10-29 15:37:25 -07:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
3855896097
EFFECTIVE MERGES:
...
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
d273ba2ce2
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
2008-05-07 20:48:38 +00:00
e1e1212daa
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
2008-05-07 17:17:42 +00:00
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Richard Linden