aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-3/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix test break - TestSerializeXml2() still requires old-guids optionJustin Clark-Casey (justincc)2010-10-161-3/+6
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-1511-143/+189
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Made OARs use the new serialization procedure. (TPs/crossings still on the ol...Diva Canto2010-10-1511-143/+189
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-152-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | UPdated the MySql driver to 6.2.4. Also established a much larger MySqlComman...Diva Canto2010-10-152-0/+1
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-0/+80
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-150-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | one more silly line ending thing.... *If you have problems, fetch the tree an...Teravus Ovares (Dan Olivares)2010-10-151-71/+71
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-71/+71
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-24/+75
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | more work in progress on mesh physics - still non-functionaldahlia2010-10-143-24/+75
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-146-6/+63
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | libomv update to support headerless llsd binary deserialization needed for me...Latif Khalifa2010-10-146-6/+63
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-70/+80
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-4/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| |\ \ \ \ \ \ \ \
| * | | | | | | | | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-3/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-105/+164
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ...Diva Canto2010-10-142-105/+164
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-147-15645/+15726
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-0/+6
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-16/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | * 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 /var/git/opensim/opensim mirror account2010-10-141-9/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
* | | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-3/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Kill some magic numbers in the caps moduleMelanie2010-10-142-3/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-133-1/+451
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | * 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 /var/git/opensim/opensim mirror account2010-10-135-27890/+27890
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-134-216/+35
| |\ \ \ \ \ \ \ \
| * | | | | | | | | * 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