aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-203-20/+68
|\
| * Deleted verbose debug messages that are bringing sims to an halt. Increased t...Diva Canto2010-10-192-3/+3
| * * One more goofy thing. I note that the sculpt texture id is broken out of t...Teravus Ovares (Dan Olivares)2010-10-201-1/+4
| * * This removes an ugly extraparams hack that I used and makes UploadObjectAss...Teravus Ovares (Dan Olivares)2010-10-201-17/+62
* | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
|\ \ | |/
| * It looks like Vector3s also got written down in lower case at some point in t...Diva Canto2010-10-191-3/+3
| * Another take related to the previous commit.Diva Canto2010-10-191-13/+17
| * Added code to quaternion deserialization to try to cope with an exception see...Diva Canto2010-10-191-4/+15
| * Added TextureAnimation and ParticleSystem to serialization.Diva Canto2010-10-191-0/+27
| * * This concludes UploadObjectAsset for now until the permissions and physics ...Teravus Ovares (Dan Olivares)2010-10-191-48/+76
| * * Almost complete implementation of UploadObjectAsset cap. all meshes get u...Teravus Ovares (Dan Olivares)2010-10-181-0/+301
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1813-67/+123
|\ \ | |/
| * Add 'contributors' notice for zlib.net.dll to keep track of its origin and ve...Justin Clark-Casey (justincc)2010-10-191-0/+1
| * Stop the InventoryTransferModule logging every IM notification it receives, e...Justin Clark-Casey (justincc)2010-10-191-3/+3
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-191-2/+2
| |\
| | * COmmented the wrong line instead, now I commented them all to be on the safe ...Melanie2010-10-191-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-1915-175/+292
| |\ \ | | |/
| | * Comment a spammy debug message in the serializerMelanie2010-10-191-1/+1
| | * Change substring matching to prefix matching in region search. This affectsMelanie2010-10-181-1/+1
| | * Alphabetize results on region search by prefix matchingMelanie2010-10-181-0/+2
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-187-165/+180
| | |\
| | | * remove some cruft from last commitdahlia2010-10-181-8/+0
| | | * initial support for meshies physics. Must set ini option UseMeshiesPhysicsMes...dahlia2010-10-184-44/+101
| | * | Bump migration version on LastSeen field so it is actually runMelanie2010-10-181-1/+1
| * | | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou...Justin Clark-Casey (justincc)2010-10-192-3/+6
| * | | Display more information when xmlrpcgroupsserver comms failsJustin Clark-Casey (justincc)2010-10-192-13/+14
* | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1740-28231/+30424
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-175-7/+107
| |\ \ \ | | | |/ | | |/|
| | * | Adding osFunctions for light projectionBlueWall2010-10-174-5/+105
| | * | typical non-effectual build triggerTeravus Ovares (Dan Olivares)2010-10-161-1/+1
| | * | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| | |/
| * | Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| * | .NET automagical serialization of SOPs replaced by manual serialization acros...Diva Canto2010-10-173-62/+28
| |/
| * Drop max oar loading version back to 0 from 1Justin Clark-Casey (justincc)2010-10-161-1/+1
| * Rip out version option since it turns out that the changed object serializati...Justin Clark-Casey (justincc)2010-10-163-10/+13
| * change --old-guids switch on the save oar command line to --version=<x>Justin Clark-Casey (justincc)2010-10-166-11/+33
| * Have OpenSim throw a strop if it tries to load an OAR with a major version th...Justin Clark-Casey (justincc)2010-10-162-1/+23
| * save oar control file first rather than in the middle so that it's the first ...Justin Clark-Casey (justincc)2010-10-163-38/+41
| * Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-1511-143/+189
| * UPdated the MySql driver to 6.2.4. Also established a much larger MySqlComman...Diva Canto2010-10-152-0/+1
| * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-150-0/+0
| |\
| | * one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| * | one more silly line ending thing.... *If you have problems, fetch the tree an...Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| |/
| * more work in progress on mesh physics - still non-functionaldahlia2010-10-143-24/+75
| * libomv update to support headerless llsd binary deserialization needed for me...Latif Khalifa2010-10-146-6/+63
| * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80