James Cook
|
1bb4c9e1c9
|
EXT-3446 Manage Telehub floater opens below buildtools
Took out custom positioning code, set left edge to 300 in XML
|
2009-12-15 17:09:35 -08:00 |
|
Richard Nelson
|
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 |
|
Austin Doupnik
|
b742355130
|
DEV-35167 Reference counted selection objects were being kept around by floaters that were being constructed, but weren't visible. Reviewed by Richard.
|
2009-07-09 22:35:39 +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 |
|
Melinda Green
|
e1d8dac25a
|
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
|
2008-12-15 21:21:19 +00:00 |
|
Steven Bennetts
|
25c10ed028
|
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
|
2008-06-26 00:39:00 +00:00 |
|
Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
Josh Bell
|
3cb5c6864e
|
QAR-211: Logical merge of:
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573
svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes
svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix
svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods
plus addition to MANIFEST for revoke-gods
Actual merge:
svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a
* QAR-177 Linux Voice Support Merge BuildMe
* QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions)
* QAR-194 simcrash-economy-fix
* QAR-201 Revoke gods added to deploy
|
2008-01-17 23:29:26 +00:00 |
|
Christian Goetze
|
5ec8bbbe22
|
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
|
2007-10-10 00:01:43 +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 |
|
Karen Clark
|
fceae96eb1
|
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
|
2007-03-20 22:21:42 +00:00 |
|
Richard Nelson
|
73bc0fb42b
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
Aaron Brashears
|
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 |
|
James Cook
|
2d96460462
|
SL-32782, SL-32838, SL-32787 Viewer crashes related to god/estate owner commands not putting transaction ids into a packet. Reviewed with Kelly.
|
2007-01-19 00:36:55 +00:00 |
|
Steven Bennetts
|
71d28bdbf0
|
merge release@56803 release-candidate@56833
|
2007-01-17 23:02:00 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |