aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-107-32/+49
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-102-3/+11
| |\
| | * * 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
| | |
| | * 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.
| * | 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 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
| |/
| * 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-0714-70/+369
|\ \ | |/
| * add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵dahlia2010-10-071-1/+2
| | | | | | | | 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
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0517-30051/+0
|\ \ | |/
| * Remove defunct sirikata client stackMelanie2010-10-0617-30051/+0
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-053-3/+20
|\ \ | |/
| * Add the view generating method to the image generator interfaceMelanie2010-10-052-0/+7
| |
| * Revert an accidental default value changeMelanie2010-10-051-1/+1
| |
| * Patch to allow other cam angles. Not complete. Thanks, Antont.Melanie2010-10-051-4/+14
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0528-70/+213
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-059-19/+19
| |\
| | * Formatting cleanup.Jeff Ames2010-10-049-19/+19
| | |
| * | Make windlight set the default environment on startBlueWall2010-10-051-0/+1
| |/
| * Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
| |
| * Made the home agent handler check for xff if behind a proxy.Diva Canto2010-10-032-3/+23
| |
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-033-3/+28
| |
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵Diva Canto2010-10-038-20/+97
| | | | | | | | client ip address to agent circuit data, so that it's always there.
| * Fix a comment markerMelanie2010-10-041-1/+1
| |
| * Add linden prim renderer and update libOMVMelanie2010-10-044-23/+38
| |
| * I really have to say it again and again: e.Message is NOT enough data forMelanie2010-10-031-2/+1
| | | | | | | | | | | | troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must be used. Fix one more instance of that cr.p
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0314-71/+1462
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-031-21/+34
| |\
| | * Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.Diva Canto2010-10-021-21/+34
| | |
| * | Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
| | |
| * | Adapt to core changesMelanie2010-10-031-1/+1
| | |
| * | Addign the new / renamed files for previous commitMelanie2010-10-038-0/+2655
| | |