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

12 Commits (9818f158366a0df980a2e4b9251177d9a9209cfb)

Author SHA1 Message Date
Steven Bennetts a1ed9ccf73 Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
 2009-08-29 06:23:41 +00:00
Aaron Brashears 6df2755ba6 Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462 2009-05-18 23:38:35 +00: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
Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk. 
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
 2008-12-04 22:36:34 +00:00
Steven Bennetts d85247e63e QAR-449 Viewer 1.20 RC 0 
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
 2008-04-17 02:42:27 +00:00
Steven Bennetts d2597d35cf Undid previous commit (bogus merge) 2008-04-17 02:25:04 +00:00
Steven Bennetts c57beb8b4b QAR-449 Viewer 1.20 RC 0 
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
 2008-04-17 02:06:30 +00:00
Adam Moss fb42741b62 QAR-455 Launcher and Heartbeat fixes MergeMe 
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@84853
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/signalcrap-merge1
 2008-04-16 09:29:07 +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 4617a37edf corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762 2007-01-03 21:05:41 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00