aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.
* | 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 ↵Teravus Ovares (Dan Olivares)2010-10-143-1/+451
| | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
* | 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
| |\ | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini
| * | * Normalizing endlines so git stops complaining about them being inconsistent.Teravus Ovares (Dan Olivares)2010-10-135-27893/+27893
| | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
| * | 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
| | | | | | | | | | | | | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL
* | | | | 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 ↵Diva Canto2010-10-131-1/+1
| | |_|/ | |/| | | | | | | | | | encountering unknown xml elements.
* | | | 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
| |/ / | | | | | | | | | | | | .ini.example ";;" format to normal ini format, since the defaults file is not parsed that way.
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-132-7/+1381
|\ \ \ | |/ /
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵Diva Canto2010-10-132-7/+1381
| | | | | | | | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet.
* | | 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
| | | | | | | | | | | | of the child prim because using the child prim plain doesn't work.
* | | 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
| | | | | | | | | | | | This reverts commit 766ce9a14146dc9814d488364f5c931d0fa96a17.
| * | Revert "Fix a comment marker"Melanie2010-10-041-1/+1
| | | | | | | | | | | | This reverts commit f89dd85f68e3e05c0ca908e5358d935a6ea3a321.
| * | Revert "Add the matching PrimMesher.dll"Melanie2010-10-041-0/+0
| | | | | | | | | | | | This reverts commit be301c5815ea57f621d565bcc40dfa7ce530162e.
| * | Revert "Replaced OpenMetaverse dlls with ones compiled in Windows."Melanie2010-10-047-17739/+18612
| | | | | | | | | | | | This reverts commit eb0cde7959a03ccbf3551b725cd6b559071857fb.
* | | * 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 ↵Latif Khalifa2010-10-091-1/+9
| | | | | | | | | | | | | | | | satisfiable
| * | | In case when 1 single byte is requested (yes viewer does this)Latif Khalifa2010-10-091-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | start of the ranges gets clamped with a wrong value. In case of a texture with 601 byte long texture the viewer request range 0-599 first, then 600- in which case both start and end should be 600. End can also be 0, valid request for the firt byte of the file is 0-0. Thanks to Thickbrick for explaining how HTTP range header works.
| * | 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
| | | | | | | | | | | | | | | | | | | | The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level. This fixes the issue of colons being added to help texts on the local console.
| * | | Fix an infinite recursionMelanie2010-10-081-1/+4
| |/ /
* | | Added missing sections to StandaloneHypergrid.iniDiva Canto2010-10-091-0/+6
|/ /
* | Guard against locking a nullref to avoid build breakMelanie2010-10-081-0/+3
| |
* | Change the order of actions to address a possible nullrefMelanie2010-10-081-3/+2
| |