aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
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-092-4/+7
|\
| * 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 c...dahlia2010-10-071-1/+2
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| * Plumb the path for multiple object deletesMelanie2010-10-065-45/+44
* | 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-0815-49/+69
* | 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-065-45/+44
* | 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-0611-19/+37
|\ \ | |/
| * 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-057-16/+16
| |\
| | * Formatting cleanup.Jeff Ames2010-10-047-16/+16
| * | 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-041-5/+17
|\ \ | |/
| * Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-5/+17
| * Fix a comment markerMelanie2010-10-041-1/+1
| * Add linden prim renderer and update libOMVMelanie2010-10-043-20/+35
* | Fix line endingsMelanie2010-10-041-184/+184
* | Add linden prim renderer and update libOMVMelanie2010-10-043-6/+6
* | 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-0312-70/+1450
|\ \ | |/
| * 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
| * | 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-037-1292/+4
| |/
* | 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