aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-065-14/+20
|\
| * 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
* | Convert worldview to GETMelanie2010-10-061-7/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-066-12/+305
|\ \ | |/
| * 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' into careminster-presence-refactorMelanie2010-10-0630-30083/+40
|\ \ | |/
| * 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
| * 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-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
* | Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-0412-26/+148
|\ \ | |/
| * 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 client...Diva Canto2010-10-038-20/+97
| * Fix a comment markerMelanie2010-10-041-1/+1
| * Add linden prim renderer and update libOMVMelanie2010-10-044-23/+38
* | Fix line endingsMelanie2010-10-041-184/+184
* | Add linden prim renderer and update libOMVMelanie2010-10-044-9/+9
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-2/+1
|\ \ | |/
| * I really have to say it again and again: e.Message is NOT enough data forMelanie2010-10-031-2/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-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
| * | Initial port of the Warp3D map tile rendererMelanie2010-10-038-1293/+5
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-021-0/+24
|\ \ | |/
| * So, the client can have an old idea of the object properties for the object w...Melanie2010-10-021-0/+24
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-024-25/+55
|\ \ | |/
| * Reapplying the parts of the prior revert that were not derived from theMelanie2010-10-023-5/+5
| * Revert "Forward-port 0.6 fix"Melanie2010-10-023-17/+5
| * Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-011-5/+33
| |\
| | * couple fixes to enable profiles in simian connectorMaster ScienceSim2010-09-301-5/+33
| * | adding -logconfig to Robust.exeBlueWall2010-10-011-6/+20
| |/
* | Replace CalculateMass with a more accurate version, contributed by Ubit.Melanie2010-10-021-234/+219
* | Replace CalculateMass with a better, contributed versionMelanie2010-10-021-243/+228