aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-131-204/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-131-1/+1
|\ \ \ \ | |/ / /
| * | | fix build breakJustin Clark-Casey (justincc)2010-10-131-1/+1
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-132-2/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-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
* | | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-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
| | |_|/ | |/| |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-131-9/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. ChangeMelanie2010-10-131-9/+8
| |/ /
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-132-7/+1381
|\ \ \ | |/ /
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-101-8/+8
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-103-3/+17
| |\ \ | | |/
| * | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
* | | Merge branch 'master' of git@github.com:opensim/opensimopensim mirror account2010-10-090-0/+0
|\ \ \ | |_|/ |/| |
| * | Revert "Add linden prim renderer and update libOMV"Melanie2010-10-0412-18083/+16774
| * | Revert "Fix a comment marker"Melanie2010-10-041-1/+1
| * | Revert "Add the matching PrimMesher.dll"Melanie2010-10-041-0/+0
| * | Revert "Replaced OpenMetaverse dlls with ones compiled in Windows."Melanie2010-10-047-17739/+18612
* | | * Make line endings consistant in Meshmerizer.csTeravus Ovares (Dan Olivares)2010-10-091-1/+1
* | | Fix a typo in previouis commit: start must not pass the end of the fileLatif Khalifa2010-10-091-2/+2
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-094-20/+35
|\ \ \
| * | | weird line endings fix commitTeravus Ovares (Dan Olivares)2010-10-091-7/+7
| * | | Return error code instead of the last byte of the file if range is not satisf...Latif Khalifa2010-10-091-1/+9
| * | | In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-092-17/+21
| |\ \
| | * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-10-091-4/+4
| | * | Limit formatting of local console output to actual logging messages.Marck2010-10-091-13/+17