aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| | * 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
| | |/
| * | * 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
| |\ \ | | |/
| | * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for loa...Diva Canto2010-10-132-7/+1381
| * | *typical non-effectual commit to trigger a buildTeravus Ovares (Dan Olivares)2010-10-131-3/+3
* | | * more url / hg cleanupJonathan Freedman2010-10-118-45/+56
* | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-108-32/+55
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-103-3/+17
| |\ \ | | |/
| | * * 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
| | * | Added missing sections to StandaloneHypergrid.iniDiva Canto2010-10-091-0/+6
| * | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
| | |/ | |/|
| * | 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
| | |/
| * | Fix an infinite recursionMelanie2010-10-081-1/+4
| |/
| * 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
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0716-72/+382
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-082-9/+9
| |\
| | * move CacheSculptMaps ini flag to OpenSimDefaults.inidahlia2010-10-072-9/+9
| * | Clarify the format comment at the top of OpenSim.ini.exampleMelanie2010-10-081-1/+4
| |/
| * add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map c...dahlia2010-10-072-1/+10
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-066-46/+45
| * Add and plumb the usetex URL parameter to worldview. Required but not yetMelanie2010-10-065-14/+20
| * Convert worldview to GETMelanie2010-10-061-7/+11
| * Change the URL /worldview to /worldview/<region id> to support multiregionMelanie2010-10-062-3/+4
| * Convert the BMP to a JPEG image and return it. This should be testable.Melanie2010-10-061-1/+7