aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Add group invites to the list of messages that get offlinedMelanie2010-10-102-14/+15
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-096-23/+41
|\
| * 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
| * | 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 melanie@opensimulator.org:/var/git/opensimMelanie2010-10-082-9/+9
| |\
| | * move CacheSculptMaps ini flag to OpenSimDefaults.inidahlia2010-10-072-9/+9
| * | 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 c...dahlia2010-10-072-1/+10
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-066-46/+45
* | Fix a security relevant issue with take / take copyMelanie2010-10-091-48/+62
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-0819-53/+79
* | Implement rezzing coalesced objectsMelanie2010-10-071-136/+182
* | Implement taking of coalesced objects.Melanie2010-10-074-207/+276
* | Plumb the path for multiple object deletesMelanie2010-10-066-46/+45
* | 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-0638-30167/+90
|\ \ | |/
| * Remove sirikata projectMelanie2010-10-061-32/+0
| * 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
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-051-4/+3
| |\
| | * Formatting cleanup.Jeff Ames2010-10-041-4/+3
| * | 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-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
* | Avoid throwing errors when adding existing meshes to the render sceneLatif Khalifa2010-10-041-0/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-0423-27994/+28045
|\ \ | |/
| * 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