aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-182-112/+86
|\
| * Deleted all [XmlIgnore] from SOP, since those are meaningless now.Diva Canto2010-10-172-58/+58
| |
| * .NET automagical serialization of SOPs replaced by manual serialization ↵Diva Canto2010-10-172-59/+21
| | | | | | | | across the board.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-162-120/+153
|\ \ | |/
| * Made OARs use the new serialization procedure. (TPs/crossings still on the ↵Diva Canto2010-10-152-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-refactorMelanie2010-10-162-309/+178
|\ \ | |/
| * Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| | | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
| * Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-132-7/+1381
|\ \ | |/
| * Comment a debug message so that it doesn't spew the console upon ↵Diva Canto2010-10-131-1/+1
| | | | | | | | encountering unknown xml elements.
| * New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵Diva Canto2010-10-132-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 insteadMelanie2010-10-101-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.Melanie2010-10-131-1/+4
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-101-14/+14
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Add group invites to the list of messages that get offlinedMelanie2010-10-101-14/+14
| | |
* | | Change the part for sound playback to be the root part / object UUID insteadMelanie2010-10-101-8/+8
|/ / | | | | | | of the child prim because using the child prim plain doesn't work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-091-3/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * 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
| |
| * Fix autoreturn to not return zero objectsMelanie2010-10-071-6/+2
| |
| * Plumb the path for multiple object deletesMelanie2010-10-064-40/+18
| |
* | 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-085-22/+29
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Implement taking of coalesced objects.Melanie2010-10-073-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 deletesMelanie2010-10-064-40/+18
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-063-4/+4
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-10-043-4/+4
| |
* | 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
| * Fix an inventory fetch issueMelanie2010-09-301-0/+3
| |
* | Enforce region agent limit as set in estate toolsMelanie2010-09-302-0/+13
| |
* | Fix an inventory fetch issueMelanie2010-09-301-0/+3
| |
* | Fix a potential key collisionMelanie2010-09-301-1/+1
| |
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
| |
* | Try to prevent threading issues in SP.SetAppearance by locking itMelanie2010-09-271-40/+45
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| |
| * Fix build breakMelanie2010-09-271-37/+38
| |
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-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 belongingMelanie2010-09-271-0/+6
| | | | | | | | to the connected client.
* | Prevent setting arbitrary groups on your objects.Melanie2010-09-271-0/+3
| |
* | Restrict inventory items added in a transaction to folder belongingMelanie2010-09-271-0/+6
| | | | | | | | to the connected client.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-253-3/+10
|\ \ | |/
| * Add UUID to physics prim name parameter so that diagnostic messages can be ↵Justin Clark-Casey (justincc)2010-09-252-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/opensimJustin Clark-Casey (justincc)2010-09-251-10/+0
| |\
| * | If the uuid gatherer fails to find the asset containing gesture metadata, ↵Justin Clark-Casey (justincc)2010-09-241-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.Melanie2010-09-241-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 ↵Melanie2010-09-211-1/+1
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| | | |
| * | | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
| | | |