aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| | | | | | | | | | | | comment it and change defailt to true to reflect code
* | | 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 ↵dahlia2010-10-072-1/+10
| | | | | | | | caching for meshing
* | 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
| | | | | | | | functional
* | 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
| |
* | Add the parameter plumbing and image generationMelanie2010-10-062-2/+22
| |
* | Add WOrldView request handler and plumbingMelanie2010-10-062-0/+155
| |
* | Fix incorrect class nameMelanie2010-10-061-1/+1
| |
* | Add WorldView module skeletonMelanie2010-10-062-0/+81
| |
* | Convert the map image modules to new style modulesMelanie2010-10-063-12/+42
| |
* | Remove sirikata projectMelanie2010-10-061-32/+0
| |
* | Remove defunct sirikata client stackMelanie2010-10-0617-30051/+0
| |
* | Add the view generating method to the image generator interfaceMelanie2010-10-052-0/+7
| |
* | Revert an accidental default value changeMelanie2010-10-051-1/+1
| |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-051-4/+3
|\ \
| * | Formatting cleanup.Jeff Ames2010-10-041-4/+3
| | |
* | | Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
|/ /
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-0515-67/+66
|\ \
| * | Formatting cleanup.Jeff Ames2010-10-049-19/+19
| | |
| * | Formatting cleanup.Jeff Ames2010-10-046-48/+47
| | |