Commit Graph

18 Commits (8bb3d0891dfd87b54cd45dfe199c2f1bf21205b3)

Author SHA1 Message Date
Nat Goodspeed 5c334bdc5b MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunk 2012-12-18 16:09:31 -05:00
Nat Goodspeed f08c5d95ac MAINT-1986: patch DEV-50942 fix (rev 28828ba0f0be) from server-trunk. 2012-12-18 14:20:06 -05:00
prep ef75a2e07e WIP:Displaying physics capsule for a character - it is currently disabled. 2012-05-31 16:38:19 -04:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Andrew A. de Laix 87082996e6 Revert to previous implementation of getNodeId. 2010-06-22 15:19:16 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 66efd3f432 fix windows build break again 2010-03-02 14:29:42 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden ff51d31af3 remove windows line endings introduced via transplant 2010-02-05 17:38:26 -08:00
Karen Lahey b90c7d648e Use malloc in order to fix linking issue 2009-10-15 19:40:20 -07:00
Karen Lahey 73e86b0bed MAC Address Change no longer causes viewer to die cr:Roxie 2009-10-15 16:52:03 -07:00
Andrew Meadows 15a6d273cc svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +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
Jon Wolk ae464867e6 svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +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
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00