aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-134-216/+35
|\ | | | | | | | | Conflicts: bin/OpenSimDefaults.ini
| * 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 ↵Diva Canto2010-10-131-1/+1
| | | | | | | | | | | | | | | | encountering unknown xml elements.
| * | | 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
| * | 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.
* | * 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
|\ \ | |/
| * 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 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.
* | | *typical non-effectual commit to trigger a buildTeravus Ovares (Dan Olivares)2010-10-131-3/+3
| |/ |/|
* | * 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
|/