aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1614-181/+281
|\
| * 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
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2010-10-1620-28269/+28913
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-10-1620-28269/+28913
| |\ \ | | |/
| | * 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
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| | |\
| | | * Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | | * Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| | | * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ...Diva Canto2010-10-142-105/+164
| | * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| | |/
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| | |\
| | | * * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| | * | Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
| | |/
| | * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| | * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-143-16/+35
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+4
| | |\
| | | * Kill some magic numbers in the caps moduleMelanie2010-10-142-3/+4
| | * | Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| | |/
| | * * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-143-1/+451
| | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-134-216/+35
| | |\
| | | * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| | | * fix build breakJustin Clark-Casey (justincc)2010-10-131-1/+1
| | * | * Normalizing endlines so git stops complaining about them being inconsistent.Teravus Ovares (Dan Olivares)2010-10-135-27893/+27893
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-133-15/+1389
| | |\ \
| | * | | *typical non-effectual commit to trigger a buildTeravus Ovares (Dan Olivares)2010-10-131-3/+3
* | | | | Actually set the PrivateBinPath in XEngine so relocating the scriptsMelanie2010-10-162-6/+7
|/ / / /
* | | | Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-133-16/+1389
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-131-1/+1
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-131-9/+8
| | |\ \ \
| | * | | | Comment a debug message so that it doesn't spew the console upon encountering...Diva Canto2010-10-131-1/+1
| | | |_|/ | | |/| |
| * | | | Correctly update the LastSeen fieldMelanie Thielker2010-10-131-1/+1
| * | | | Ensure no UUID.Zero region ID is ever written to presence. Add a MigrationMelanie Thielker2010-10-132-1/+11
| | |/ / | |/| |
| * | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. ChangeMelanie2010-10-131-9/+8
| |/ /
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
* | | change default next owner persm to mod/trans to match SL.Melanie2010-10-131-1/+4