Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 2 | -112/+86 |
|\ | |||||
| * | Deleted all [XmlIgnore] from SOP, since those are meaningless now. | Diva Canto | 2010-10-17 | 2 | -58/+58 |
| | | |||||
| * | .NET automagical serialization of SOPs replaced by manual serialization ↵ | Diva Canto | 2010-10-17 | 2 | -59/+21 |
| | | | | | | | | across the board. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 2 | -120/+153 |
|\ \ | |/ | |||||
| * | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 2 | -120/+153 |
| | | | | | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 2 | -309/+178 |
|\ \ | |/ | |||||
| * | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵ | Diva Canto | 2010-10-14 | 2 | -105/+164 |
| | | | | | | | | to be generating xml's that are successfully parsed. Needs more testing. | ||||
| * | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-13 | 2 | -7/+1381 |
|\ \ | |/ | |||||
| * | Comment a debug message so that it doesn't spew the console upon ↵ | Diva Canto | 2010-10-13 | 1 | -1/+1 |
| | | | | | | | | encountering unknown xml elements. | ||||
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵ | Diva Canto | 2010-10-13 | 2 | -7/+1381 |
| | | | | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet. | ||||
| * | 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. | ||||
* | | change default next owner persm to mod/trans to match SL. | Melanie | 2010-10-13 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-10 | 1 | -14/+14 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Add group invites to the list of messages that get offlined | Melanie | 2010-10-10 | 1 | -14/+14 |
| | | | |||||
* | | | 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 | 1 | -3/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| * | 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 |
| | | |||||
| * | 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 | 4 | -40/+18 |
| | | |||||
* | | 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 | 5 | -22/+29 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Implement taking of coalesced objects. | Melanie | 2010-10-07 | 3 | -7/+13 |
| | | | | | | | | | | | | | | 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 | 4 | -40/+18 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 3 | -4/+4 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 3 | -4/+4 |
| | | |||||
* | | 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 | ||||
| * | Fix an inventory fetch issue | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | |||||
* | | Enforce region agent limit as set in estate tools | Melanie | 2010-09-30 | 2 | -0/+13 |
| | | |||||
* | | Fix an inventory fetch issue | Melanie | 2010-09-30 | 1 | -0/+3 |
| | | |||||
* | | Fix a potential key collision | Melanie | 2010-09-30 | 1 | -1/+1 |
| | | |||||
* | | Lock the iteration over the inventory items when saving script states | Melanie | 2010-09-28 | 1 | -0/+2 |
| | | |||||
* | | Try to prevent threading issues in SP.SetAppearance by locking it | Melanie | 2010-09-27 | 1 | -40/+45 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-27 | 1 | -47/+48 |
|\ \ | |/ | |||||
| * | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
| * | Fix build break | Melanie | 2010-09-27 | 1 | -37/+38 |
| | | |||||
| * | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-27 | 1 | -3/+11 |
| | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | ||||
| * | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 |
| | | | | | | | | to the connected client. | ||||
* | | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
* | | Restrict inventory items added in a transaction to folder belonging | Melanie | 2010-09-27 | 1 | -0/+6 |
| | | | | | | | | to the connected client. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-25 | 3 | -3/+10 |
|\ \ | |/ | |||||
| * | Add UUID to physics prim name parameter so that diagnostic messages can be ↵ | Justin Clark-Casey (justincc) | 2010-09-25 | 2 | -3/+3 |
| | | | | | | | | | | | | made more useful. If a separate UUID parameter is better for the future then this can be added later on. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-25 | 1 | -10/+0 |
| |\ | |||||
| * | | If the uuid gatherer fails to find the asset containing gesture metadata, ↵ | Justin Clark-Casey (justincc) | 2010-09-24 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | then simply return rather than generating an exception This matches existing behaviour, though better diagnostics for missing assets may be good later on. This addresses http://opensimulator.org/mantis/view.php?id=4977 | ||||
* | | | if you can't edit a prim's inventory, you don't need to see the asset ids. | Melanie | 2010-09-24 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors. | ||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 |
| | | | | |||||
| * | | | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -1/+1 |
| | | | |