Ansariel
|
a0188a5358
|
Merge Firestorm LGPL
|
2016-05-09 12:41:24 +02:00 |
|
Mnikolenko ProductEngine
|
b737630f6a
|
MAINT-6274 FIXED Mouse pointer incorrectly appears on the edge of the screen after dragging World map
|
2016-04-01 14:31:46 +03:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
David Parks
|
536e38ad51
|
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
|
2009-09-22 11:11:45 +00:00 |
|
Richard Nelson
|
138bf11322
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
|
2009-08-24 20:04:52 +00:00 |
|
Martin Reddy
|
5354caa136
|
Fixed compile warnings in llmath/llrect.h. This header is now included in a unit test
in indra/test where warnings are treated as errors.
|
2009-07-15 18:10:00 +00:00 |
|
Steven Bennetts
|
ade6bbb06c
|
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
|
2009-06-21 17:16:27 +00:00 |
|
Steven Bennetts
|
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 |
|
Aaron Brashears
|
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 |
|
Kent Quirk
|
667ca55bad
|
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
|
2009-01-05 18:59:12 +00:00 |
|
Karl Steifvater
|
52562e2e66
|
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
|
2008-07-23 21:20:19 +00:00 |
|
Josh Bell
|
35b4a91129
|
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
|
2008-07-22 20:55:02 +00:00 |
|
Karl Steifvater
|
df4f20d4f5
|
merge uv-picking branch.
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
|
2008-07-22 20:12:37 +00:00 |
|
Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
Steven Bennetts
|
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 |
|
Jon Wolk
|
7dd08303a3
|
svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134
|
2007-12-19 00:56:59 +00:00 |
|
Aaron Brashears
|
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 |
|
Monroe Williams
|
7138fb673a
|
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
|
2007-08-02 01:18:34 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |