Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 |
| | | | | of the child prim because using the child prim plain doesn't work. | ||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 4 | -21/+28 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-09 | 2 | -17/+21 |
| |\ | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-10-09 | 1 | -4/+4 |
| | | | |||||
| | * | Limit formatting of local console output to actual logging messages. | Marck | 2010-10-09 | 1 | -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 recursion | Melanie | 2010-10-08 | 1 | -1/+4 |
| |/ | |||||
| * | Guard against locking a nullref to avoid build break | Melanie | 2010-10-08 | 1 | -0/+3 |
| | | |||||
| * | Change the order of actions to address a possible nullref | Melanie | 2010-10-08 | 1 | -3/+2 |
| | | |||||
| * | add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map ↵ | dahlia | 2010-10-07 | 1 | -1/+2 |
| | | | | | | | | caching for meshing | ||||
| * | Fix autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 |
| | | |||||
| * | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 6 | -46/+45 |
| | | |||||
* | | Fix a security relevant issue with take / take copy | Melanie | 2010-10-09 | 1 | -48/+62 |
| | | |||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 19 | -53/+79 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Implement rezzing coalesced objects | Melanie | 2010-10-07 | 1 | -136/+182 |
| | | |||||
* | | Implement taking of coalesced objects. | Melanie | 2010-10-07 | 4 | -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 deletes | Melanie | 2010-10-06 | 6 | -46/+45 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 5 | -14/+20 |
|\ \ | |/ | |||||
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 5 | -14/+20 |
| | | | | | | | | functional | ||||
| * | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 |
| | | |||||
* | | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 6 | -12/+305 |
|\ \ | |/ | |||||
| * | Change the URL /worldview to /worldview/<region id> to support multiregion | Melanie | 2010-10-06 | 2 | -3/+4 |
| | | |||||
| * | Convert the BMP to a JPEG image and return it. This should be testable. | Melanie | 2010-10-06 | 1 | -1/+7 |
| | | |||||
| * | Add the parameter plumbing and image generation | Melanie | 2010-10-06 | 2 | -2/+22 |
| | | |||||
| * | Add WOrldView request handler and plumbing | Melanie | 2010-10-06 | 2 | -0/+155 |
| | | |||||
| * | Fix incorrect class name | Melanie | 2010-10-06 | 1 | -1/+1 |
| | | |||||
| * | Add WorldView module skeleton | Melanie | 2010-10-06 | 2 | -0/+81 |
| | | |||||
| * | Convert the map image modules to new style modules | Melanie | 2010-10-06 | 3 | -12/+42 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 30 | -30083/+40 |
|\ \ | |/ | |||||
| * | Remove defunct sirikata client stack | Melanie | 2010-10-06 | 17 | -30051/+0 |
| | | |||||
| * | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 2 | -0/+7 |
| | | |||||
| * | Revert an accidental default value change | Melanie | 2010-10-05 | 1 | -1/+1 |
| | | |||||
| * | Patch to allow other cam angles. Not complete. Thanks, Antont. | Melanie | 2010-10-05 | 1 | -4/+14 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-05 | 9 | -19/+19 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 9 | -19/+19 |
| | | | |||||
| * | | Make windlight set the default environment on start | BlueWall | 2010-10-05 | 1 | -0/+1 |
| |/ | |||||
| * | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 |
| | | |||||
* | | Avoid throwing errors when adding existing meshes to the render scene | Latif Khalifa | 2010-10-04 | 1 | -0/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 12 | -26/+148 |
|\ \ | |/ | |||||
| * | Made the home agent handler check for xff if behind a proxy. | Diva Canto | 2010-10-03 | 2 | -3/+23 |
| | | |||||
| * | Made the Gatekeeper proxy-able. | Diva Canto | 2010-10-03 | 3 | -3/+28 |
| | | |||||
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 8 | -20/+97 |
| | | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
| * | Fix a comment marker | Melanie | 2010-10-04 | 1 | -1/+1 |
| | | |||||
| * | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 4 | -23/+38 |
| | | |||||
* | | Fix line endings | Melanie | 2010-10-04 | 1 | -184/+184 |
| | | |||||
* | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 4 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | I really have to say it again and again: e.Message is NOT enough data for | Melanie | 2010-10-03 | 1 | -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-refactor | Melanie | 2010-10-03 | 14 | -71/+1462 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-03 | 1 | -21/+34 |
| |\ |