Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 4 | -216/+35 |
|\ | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini | ||||
| * | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 |
| | | |||||
| * | fix build break | Justin Clark-Casey (justincc) | 2010-10-13 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-13 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-13 | 1 | -9/+8 |
| | |\ | |||||
| | * | | Comment a debug message so that it doesn't spew the console upon ↵ | Diva Canto | 2010-10-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | encountering unknown xml elements. | ||||
| * | | | Correctly update the LastSeen field | Melanie Thielker | 2010-10-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Ensure no UUID.Zero region ID is ever written to presence. Add a Migration | Melanie Thielker | 2010-10-13 | 2 | -1/+11 |
| | |/ | |/| | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL | ||||
| * | | Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change | Melanie | 2010-10-13 | 1 | -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-13 | 5 | -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/opensim | Teravus Ovares (Dan Olivares) | 2010-10-13 | 3 | -15/+1389 |
|\ \ | |/ | |||||
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵ | Diva Canto | 2010-10-13 | 2 | -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/opensim | Melanie | 2010-10-10 | 3 | -3/+17 |
| |\ | |||||
| * | | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 |
| | | | | | | | | | | | | of the child prim because using the child prim plain doesn't work. | ||||
* | | | *typical non-effectual commit to trigger a build | Teravus Ovares (Dan Olivares) | 2010-10-13 | 1 | -3/+3 |
| |/ |/| | |||||
* | | * Make line endings consistant in Meshmerizer.cs | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -1/+1 |
| | | |||||
* | | Fix a typo in previouis commit: start must not pass the end of the file | Latif Khalifa | 2010-10-09 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-09 | 4 | -20/+35 |
|\ \ | |||||
| * | | weird line endings fix commit | Teravus Ovares (Dan Olivares) | 2010-10-09 | 1 | -7/+7 |
| | | | |||||
| * | | Return error code instead of the last byte of the file if range is not ↵ | Latif Khalifa | 2010-10-09 | 1 | -1/+9 |
| | | | | | | | | | | | | satisfiable | ||||
| * | | In case when 1 single byte is requested (yes viewer does this) | Latif Khalifa | 2010-10-09 | 1 | -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/opensim | Melanie | 2010-10-09 | 2 | -17/+21 |
| |\ | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-10-09 | 1 | -4/+4 |
| | | | |||||
| | * | Limit formatting of local console output to actual logging messages. | Marck | 2010-10-09 | 1 | -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 recursion | Melanie | 2010-10-08 | 1 | -1/+4 |
| |/ | |||||
* | | Added missing sections to StandaloneHypergrid.ini | Diva Canto | 2010-10-09 | 1 | -0/+6 |
|/ | |||||
* | Guard against locking a nullref to avoid build break | Melanie | 2010-10-08 | 1 | -0/+3 |
| | |||||
* | Change the order of actions to address a possible nullref | Melanie | 2010-10-08 | 1 | -3/+2 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-08 | 2 | -9/+9 |
|\ | |||||
| * | move CacheSculptMaps ini flag to OpenSimDefaults.ini | dahlia | 2010-10-07 | 2 | -9/+9 |
| | | | | | | | | comment it and change defailt to true to reflect code | ||||
* | | Clarify the format comment at the top of OpenSim.ini.example | Melanie | 2010-10-08 | 1 | -1/+4 |
|/ | |||||
* | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 2 | -1/+10 |
| | | | | caching for meshing | ||||
* | Fix autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 |
| | |||||
* | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 6 | -46/+45 |
| | |||||
* | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 5 | -14/+20 |
| | | | | functional | ||||
* | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 |
| | |||||
* | Change the URL /worldview to /worldview/<region id> to support multiregion | Melanie | 2010-10-06 | 2 | -3/+4 |
| | |||||
* | Convert the BMP to a JPEG image and return it. This should be testable. | Melanie | 2010-10-06 | 1 | -1/+7 |
| | |||||
* | Add the parameter plumbing and image generation | Melanie | 2010-10-06 | 2 | -2/+22 |
| | |||||
* | Add WOrldView request handler and plumbing | Melanie | 2010-10-06 | 2 | -0/+155 |
| | |||||
* | Fix incorrect class name | Melanie | 2010-10-06 | 1 | -1/+1 |
| | |||||
* | Add WorldView module skeleton | Melanie | 2010-10-06 | 2 | -0/+81 |
| | |||||
* | Convert the map image modules to new style modules | Melanie | 2010-10-06 | 3 | -12/+42 |
| | |||||
* | Remove sirikata project | Melanie | 2010-10-06 | 1 | -32/+0 |
| | |||||
* | Remove defunct sirikata client stack | Melanie | 2010-10-06 | 17 | -30051/+0 |
| | |||||
* | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 2 | -0/+7 |
| | |||||
* | Revert an accidental default value change | Melanie | 2010-10-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-05 | 1 | -4/+3 |
|\ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -4/+3 |
| | | |||||
* | | Patch to allow other cam angles. Not complete. Thanks, Antont. | Melanie | 2010-10-05 | 1 | -4/+14 |
|/ |