livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
277 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

277 Commits (a64f283477ea4db09c8b515ab94709e1fb5c82af)

Author SHA1 Message Date
Don Kjer a64f283477 Switching from XML streaming to Notation streaming for new streambase logging format. 2007-12-06 23:50:17 +00:00
Don Kjer 2c89da4c6f EFFECTIVE MERGE: svn -r 74436:74675 svn+ssh://svn/svn/linden/branches/log-streambase-1 
ACTUAL MERGE: svn merge -r 75220:75225 svn+ssh://svn/svn/linden/qa/log-streambase-1-merge-75217
 2007-12-06 23:43:36 +00:00
Don Kjer 0a7265b1cc svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release 
Fix for simulator crash (null pointer dereference during lldebugs)
 2007-12-06 20:32:46 +00:00
Don Kjer 9754d265eb EFFECTIVE MERGE: svn merge -r 73781:75018 svn+ssh://svn/svn/linden/branches/FixGroupVotes into release 
ACTUAL MERGE: svn merge -r 75163:75166 svn+ssh://svn/svn/linden/qa/FixGroupVotes-merge-75160 into release
 2007-12-06 18:18:35 +00:00
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
 2007-12-05 23:43:56 +00:00
Aaron Brashears 45057e8881 removed use of typeid() 2007-12-05 18:27:07 +00:00
Aaron Brashears 2a9be0445b Result of svn merge -r74235:74242 svn+ssh://svn/svn/linden/branches/robust-pump into release 2007-12-05 01:15:45 +00:00
Steven Bennetts f8511d77a7 EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release 
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
 2007-12-04 16:46:00 +00:00
Josh Bell 90aa2ddb2e svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 
Last of the fixes from 1.18.5 Viewer RC series
 2007-12-03 21:41:38 +00:00
Steven Bennetts f41b7bb8df -74901 (back out premature commit to release) 2007-12-03 19:44:04 +00:00
Steven Bennetts d5eef2d8a6 merge -r 73391:74133 maint-ui-3 -> release 2007-12-03 19:36:44 +00:00
Christian Goetze 7b7dd4e6f6 svn merge -r74808:74832 svn+ssh://svn/svn/linden/branches/qa-dpo-9a 2007-12-01 01:29:28 +00:00
Josh Bell 5c53c187ff Trivial change to not print an error from a library (was blocking use in CGIs). Suggested by donovan. 2007-11-30 00:53:21 +00:00
Josh Bell f5d50760d8 Pick up patches from 1.18.6 production branch 
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
 2007-11-28 23:12:57 +00:00
Josh Bell 75daa12872 svn merge -r 72903:73200 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release 
Missed merge range in release r74199. Josh is an idiot.
 2007-11-27 19:48:41 +00:00
Josh Bell ecc4b297e5 svn merge -r 74317:74381 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 2007-11-26 22:48:22 +00:00
Christian Goetze fa098e1dee svn merge -r74202:74317 svn+ssh://svn/svn/linden/branches/Branch_1-18-5-Viewer -> release 2007-11-22 02:21:15 +00:00
Leyla Farazha 25dbf0c567 DEV-6323 All menu hotkeys are active in login screen 2007-11-21 23:33:50 +00:00
Josh Bell e5057b4747 svn merge -r 73201:74169 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release 2007-11-21 02:29:23 +00:00
Josh Bell 78aec043f3 svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 2007-11-21 02:10:12 +00:00
Leyla Farazha 11d85dac83 world map quick fix 2007-11-21 01:54:53 +00:00
Kyle Machulis 2e7c0d973e svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
Leyla Farazha 5356b91754 patch to fix grid selection problem, now resetting URIs every time 2007-11-20 19:15:09 +00:00
Steven Bennetts 9a85f0d0bd Reverting accidental changes from age-verification merge (only affects vc8 build) 2007-11-20 03:42:06 +00:00
Tess Chu 2f6c760624 svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7 2007-11-20 02:53:43 +00:00
Tess Chu 813b140d07 svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge 2007-11-15 22:39:12 +00:00
Tess Chu 291d99bc66 svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 2007-11-15 19:22:19 +00:00
Kent Quirk 138bf17c3c merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +00:00
Don Kjer c1920e3c1c EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release 
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
 2007-11-09 01:56:15 +00:00
Steven Bennetts 760f2ceb15 svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release 
Backport patches and translations from RC branch
 2007-11-08 18:59:20 +00:00
Steven Bennetts 0771e39d20 Reverting unintentional commit of indra.l 2007-11-08 00:16:19 +00:00
Steven Bennetts 424af0690a Removied viewer.h from macview_prefix.h 2007-11-07 23:15:09 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Karl Steifvater 6fd04521d7 merge -r71488:71881 svn+ssh://svn.lindenlab.com/svn/linden/branches/flex-bison --> release 2007-11-05 19:51:45 +00:00
Leyla Farazha 1e7917fa89 Committing viewer-auth-server into release svn merge -r72818:72835 svn+ssh://svn/svn/linden/branches/viewer-auth-server-2 2007-11-02 21:26:41 +00:00
Josh Bell 0f00eef217 svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release 
Backport patches and translations from RC branch
 2007-11-01 23:10:05 +00:00
Josh Bell ef0eb8dbcf svn merge -r 72356:72879 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release 
Backport fixes from 1.18.3 Server
 2007-11-01 22:23:39 +00:00
Josh Bell 7afa8058aa svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release 
QAR-11: pair-reviewed the merge w/ Sam.
 2007-11-01 22:02:35 +00:00
Josh Bell 833e8d5c2a svn merge -r 71403:72356 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release 
Backport of fixes from production branch. Merge verified with QAR-41
 2007-10-25 22:31:09 +00:00
Steven Bennetts ca6f741982 VC8 Fixes. 2007-10-25 01:43:19 +00:00
Jon Wolk 94bcd2c47d svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expire-group-voice-channels -> release. Reverted 2 changes from the merge that were useless code. 2007-10-22 18:17:47 +00:00
Christian Goetze aa8b0cbe69 QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4 2007-10-17 22:09:27 +00:00
Brian McGroarty 788c18c00d Merge maint-viewer @ r71064 2007-10-11 19:43:20 +00:00
Don Kjer 1b550aaec2 EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release 
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
 2007-10-11 00:28:42 +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
James Cook b3b62c3b9e Fixed obvious typo, paired with rdw. 2007-10-08 22:40:47 +00:00
Ryan Williams fbfd85165c Little trick to further sweep SL-56900 under the rug. Not reviewed, I wish this were otherwise, but it needs to be committed to release so the osiris external can pick it up and I don't want to have to manually create /var/www/.python-eggs anymore. 2007-10-06 04:07:27 +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
Aaron Brashears 4942a7b779 Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release. 2007-10-04 16:31:48 +00:00
Ryan Williams 9fc7049151 This should hide the problem in SL-56900. Reviewed by Donovan. 2007-10-03 23:20:12 +00:00