aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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 client...Diva Canto2010-10-038-20/+97
| |/
| * 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
* | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0320-71/+1506
|\ \ \ | | |/ | |/|
| * | Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex...Diva Canto2010-10-034-0/+41
| |/
| * 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
| * | 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-039-1293/+8
| |/
* | * additional serveruri cleanupJonathan Freedman2010-10-038-54/+20
* | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-0214-94/+72
|/
* So, the client can have an old idea of the object properties for the object w...Melanie2010-10-021-0/+24
* 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-012-7/+21
|/
* Prevent dropping someone else's attachmentsMelanie2010-09-301-0/+3
* Forward-port 0.6 fixMelanie2010-09-303-5/+17
* Fix an inventory fetch issueMelanie2010-09-301-0/+3