aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0716-72/+382
|\
| * 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
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0518-30083/+0
|\ \ | |/
| * Remove sirikata projectMelanie2010-10-061-32/+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
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-051-4/+3
| |\
| * | 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-0545-27668/+28159
|\ \ \ | | |/ | |/|
| * | Formatting cleanup.Jeff Ames2010-10-041-4/+3
| |/
| * 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
| | |
| * | 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
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-043-3/+26
| |\
| | * Made the home agent handler check for xff if behind a proxy.Diva Canto2010-10-033-3/+26
| | |
| * | Added Meshmerizer rendering plugin for libomvLatif Khalifa2010-10-041-0/+0
| | |
| * | Removed linden rendererLatif Khalifa2010-10-041-0/+0
| | |
| * | Use libomv 0.8.4.3445Latif Khalifa2010-10-047-27968/+27887
| |/
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-035-3/+35
| |
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-10-031-0/+0
| |\
| | * Add the matching PrimMesher.dllMelanie2010-10-041-0/+0
| | |
| * | 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.
| * Replaced OpenMetaverse dlls with ones compiled in Windows.Diva Canto2010-10-037-18612/+17739
| |
| * Fix a comment markerMelanie2010-10-041-1/+1
| |
| * Add linden prim renderer and update libOMVMelanie2010-10-0412-16774/+18083
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-034-0/+41
| |\
| * | 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-0320-71/+1506
|\ \ \ | | |/ | |/|
| * | Upgraded Mono.Addins.dll to 0.5, coming from here: ↵Diva Canto2010-10-034-0/+41
| |/ | | | | | | http://monoaddins.codeplex.com/
| * Add the Warp3D dllMelanie2010-10-031-0/+0
| |
| * 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
| | |