Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 1 | -1/+4 |
|\ | |||||
| * | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+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 | ||||
| * | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
* | | Enforce region agent limit as set in estate tools | Melanie | 2010-09-30 | 1 | -0/+5 |
| | | |||||
* | | Prevent setting arbitrary groups on your objects. | Melanie | 2010-09-27 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -34/+21 |
|\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -33/+20 |
| | | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -10/+0 |
|\ \ | |/ | |||||
| * | Remove SceneGraph.DetachObject() which was accidentally left around after ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -10/+0 |
| | | | | | | | | being migrated to AttachmentsModule | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -159/+148 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -3/+3 |
| | | |||||
| * | Second pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -34/+32 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -136/+127 |
| | | |||||
* | | Fix some issues with unlinking | Melanie Thielker | 2010-09-07 | 1 | -56/+53 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Make sure unlinked child prims get persisted | Melanie | 2010-09-07 | 1 | -0/+5 |
| | | |||||
| * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | script state enum to reflect recent changes. | ||||
* | | Don't turn off the sale settings on child prims when linking, and on copy | Melanie Thielker | 2010-09-06 | 1 | -8/+0 |
| | | | | | | | | | | of prims anymore. The behavior now matches SL and can be used to link vendor prims for transport | ||||
* | | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | script state enum to reflect recent changes. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -38/+25 |
|\ \ | |/ | |||||
| * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -25/+26 |
| | | |||||
| * | refactor: break out attachment position change code in ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -24/+13 |
| | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions. | ||||
| * | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -2/+0 |
| | | |||||
* | | Fix a horrible bug in SG, where iteration of scene objects is carried | Melanie Thielker | 2010-08-26 | 1 | -2/+4 |
| | | | | | | | | | | out in a fashion that causes the delegate to be invoked once per child prim for a given group. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -36/+54 |
|\ \ | |/ | | | | | This was rather conflicted. Please test linking. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -26/+38 |
| |\ | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -45/+66 |
| | | | | | | | | | | | | conditions in linking and unlinking | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -0/+36 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 1 | -17/+29 |
| |/ | | | | | | | sticking around | ||||
| * | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user | ||||
* | | Change object cleanup again. Make scene object directories more robust and | Melanie Thielker | 2010-08-25 | 1 | -17/+29 |
| | | | | | | | | prevent deleted SOP's from sticking around | ||||
* | | Fix minimap issues. This addresses mantis #228. | meta7 | 2010-08-08 | 1 | -21/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Add new SceneGraphTests class. Add simple TestDuplicateObject() | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -1/+1 |
| | | |||||
| * | minor: a few miscellaneous comments | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 1 | -5/+0 |
|\ \ | |/ | |||||
| * | remove unused BasicQuadTreeNode | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -5/+0 |
| | | |||||
| * | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms. | ||||
| * | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
* | | Allow megaregions to be used in M7, should we so decide | Melanie Thielker | 2010-07-21 | 1 | -22/+25 |
| | | |||||
* | | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
* | | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms. | ||||
* | | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
* | | Add new event: OnChangedBackup | Tom Grimshaw | 2010-06-25 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-25 | 1 | -6/+7 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 1 | -6/+7 |
| |\ \ | | |/ | |||||
| | * | stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵ | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | isn't present in the presence dictionary the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place |