aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-094-21/+28
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * 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
| |
| * 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
| |
* | 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
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Implement rezzing coalesced objectsMelanie2010-10-071-136/+182
| |
* | Implement taking of coalesced objects.Melanie2010-10-074-207/+276
| | | | | | | | | | | | | | WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not.
* | 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
| | | | | | | | functional
| * 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 ↵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
| |
* | 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
| | | | | | | | | | | | 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' 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
| | |
generated by cgit v1.1 at 2024-12-27 16:06:14 +0000