Graham Madarasz
|
fd447189c5
|
Merge 3.5.1 into Materials
|
2013-04-25 21:00:16 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Geenz
|
5f03e197f4
|
Trying to set materials up for rendering! Yay!
|
2013-01-25 17:54:38 -05:00 |
|
William Todd Stinson
|
38a565f71a
|
Initial pass at getting a list of viewer objects with non-null material IDs.
|
2012-10-09 12:30:38 -07:00 |
|
Dave Parks
|
4a5ad35793
|
MAINT-570 Remove unused memory tracking system LLMemType
|
2012-07-20 11:42:15 -05:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
Bryan O'Sullivan
|
30ff6cabd6
|
Merge with trunk
|
2009-08-31 13:47:47 -07:00 |
|
Christian Goetze
|
d025b721e0
|
svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
QAR-1691
|
2009-07-15 17:55:58 +00:00 |
|
Christian Goetze
|
e588d1f284
|
svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654
QAR-1654 merge completed.
|
2009-07-01 00:22:05 +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 |
|
Andrew Meadows
|
3d4e04b556
|
QAR-1284 ip-takedown tools simulator work is ready for merge
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5
no conflicts
|
2009-04-01 17:11:37 +00:00 |