Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 10 | -2784/+27 |
|\ | |||||
| * | Merge branch 'master' into caps | Diva Canto | 2011-05-04 | 2 | -1/+6 |
| |\ | |||||
| * | | Changed the defaults, so that it behaves exactly is it has been behaving (no ↵ | Diva Canto | 2011-05-02 | 1 | -0/+2 |
| | | | | | | | | | | | | WebFetch cap by default). | ||||
| * | | Fixed: EventQueueGet and other caps were being wrongly deregistered. Also ↵ | Diva Canto | 2011-05-02 | 1 | -1/+0 |
| | | | | | | | | | | | | CapabilitiesModule was being instantiated twice (damn Mono.Addins). | ||||
| * | | Works! | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | | |||||
| * | | Broke down Caps.cs into a generic Caps object that simply ↵ | Diva Canto | 2011-05-01 | 2 | -32/+22 |
| | | | | | | | | | | | | | | | | | | | | | registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps. Renamed a few methods that were misnomers. Compiles but doesn't work. | ||||
| * | | Move CapabilitiesModule back to CoreModules. This one belongs there. | Diva Canto | 2011-05-01 | 1 | -0/+257 |
| | | | |||||
| * | | Merge branch 'master' into caps | Diva Canto | 2011-05-01 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | Nope, that didn't feel right. Moving all those modules to Linden space. | Diva Canto | 2011-04-30 | 6 | -1887/+0 |
| | | | | |||||
| * | | | Moved several cap-based-service-providing modules from where they were into ↵ | Diva Canto | 2011-04-30 | 6 | -6/+6 |
| | | | | | | | | | | | | | | | | a newly created CoreModules/Caps. Not all. | ||||
| * | | | First stab at cleaning up Caps. Compiles. Untested. | Diva Canto | 2011-04-30 | 2 | -1118/+0 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -4/+13 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Put the previous state back in the attachments in case the agent transfer fails. | Diva Canto | 2011-05-04 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fixes mantis #5461. | Diva Canto | 2011-05-04 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Check for RegionID instead of RegionHandle. Other minor tweaks | Diva Canto | 2011-04-30 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 6 | -46/+67 |
|\ \ | |/ | |||||
| * | Remove the scripts of the attachments in the departing region and recreate ↵ | Diva Canto | 2011-04-29 | 1 | -2/+10 |
| | | | | | | | | them if fail. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-04-28 | 1 | -4/+5 |
| |\ | |||||
| | * | Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim. | Justin Clark-Casey (justincc) | 2011-04-28 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5444 Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct. This did not effect scripts. | ||||
| * | | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 5 | -40/+52 |
| |/ | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 3 | -12/+36 |
|\ \ | |/ | |||||
| * | Made things consistent between LocalInventoryServiceConnector and ↵ | Diva Canto | 2011-04-25 | 2 | -11/+32 |
| | | | | | | | | RemoteXInventoryServiceConnector on GetFolderContent. | ||||
| * | Added MaxAgents configuration option to RegionConfig.ini allowing region ↵ | E. Allen Soard | 2011-04-23 | 1 | -1/+4 |
| | | | | | | | | hosters to setup regions maintaining more control over system resources. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-22 | 2 | -2/+2 |
|\ \ | |/ | |||||
| * | some mesh config asthetics | BlueWall | 2011-04-21 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 9 | -302/+363 |
|\ \ | |/ | |||||
| * | Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -8/+12 |
| | | | | | | | | | | | | | | config parameters. Default remains true. OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything. | ||||
| * | bump default IAR version to 0.2 and 1.1 for the --profile version. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| | | | | | | | | There are no changes in this bump, they just signal a point at which the control file comes first in the archive. | ||||
| * | bump oar version number to 0.6. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+1 |
| | | | | | | | | This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive. | ||||
| * | Add regression test to check that OARs start with the control file. | Justin Clark-Casey (justincc) | 2011-04-18 | 3 | -9/+21 |
| | | |||||
| * | add test to ensure that an IAR starts with the control file | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -11/+39 |
| | | |||||
| * | refactor: split out the code which actually copies a particular bundle to ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -106/+115 |
| | | | | | | | | inventory | ||||
| * | refactor: rename DeleteToInventory() to CopyToInventory() | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -1/+1 |
| | | | | | | | | DeleteToInventory() is misleading - it is the caller that decides whether to delete or not | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 2 | -17/+49 |
|\ \ | |/ | |||||
| * | Fix bug where objects were being coalesced in the wrong positions. | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -2/+2 |
| | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=5441 The bug was due to a pre-existing mistake in creating the inventory stored position | ||||
| * | Provide a configuration setting to control whether multiple taken objects ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 2 | -15/+47 |
| | | | | | | | | | | | | | | are coalesced to inventory This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini Default is true. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-04-17 | 30 | -99/+441 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 30 | -99/+441 |
| |\ \ | | |/ | |||||
| | * | Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more ↵ | Diva Canto | 2011-04-15 | 2 | -25/+12 |
| | | | | | | | | | | | | testing to make sure HG inventory isn't broken by this (it shouldn't). | ||||
| | * | refactor: separate out code that adds permissions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -42/+59 |
| | | | |||||
| | * | minor: remove a small amount of code duplication | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -4/+3 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-04-15 | 2 | -3/+21 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-14 | 5 | -11/+11 |
| | | |\ | |||||
| | | * | | Add ColladaMesh switch | BlueWall | 2011-04-14 | 2 | -3/+21 |
| | | | | | |||||
| | * | | | refactor: split out some rez code into a separate CreateItemForObject() method | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -143/+159 |
| | | |/ | | |/| | |||||
| | * | | get rid of all traces of the now used mock service infrastructure | Justin Clark-Casey (justincc) | 2011-04-15 | 5 | -11/+11 |
| | |/ | |||||
| | * | extend TestLoadCoalesecedItem() to check loaded object ids and positions | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -1/+7 |
| | | | |||||
| | * | Make all the objects in a coalescence reappears after being loaded from an ↵ | Justin Clark-Casey (justincc) | 2011-04-15 | 4 | -26/+49 |
| | | | | | | | | | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups. | ||||
| | * | implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet. | Justin Clark-Casey (justincc) | 2011-04-14 | 2 | -4/+48 |
| | | |