aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Don't turn off the sale settings on child prims when linking, and on copyMelanie Thielker2010-09-061-8/+0
| | | | | of prims anymore. The behavior now matches SL and can be used to link vendor prims for transport
* Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-061-1/+25
| | | | modules need to see it (Search!) even if it comes in via CAPS
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-052-18/+43
|\
| * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| |
| * Move code that allows llGiveInvetory() to move item into appropriate system ↵Justin Clark-Casey (justincc)2010-09-041-8/+40
| | | | | | | | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
| * Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)Justin Clark-Casey (justincc)2010-09-041-8/+27
| | | | | | | | The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-0/+21
|\ \ | |/
| * Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
| |
| * Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| |
| * Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| |
| * refactor: move SOG.AttachToAgent() into AttachmentsModuleJustin Clark-Casey (justincc)2010-09-011-71/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-013-3/+3
| |\
| | * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-313-3/+3
| | | | | | | | | | | | script state enum to reflect recent changes.
| * | Add ScenePresence.GetAttachments(uint attachmentPoint)Justin Clark-Casey (justincc)2010-08-311-0/+21
| |/
* | Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
| |
* | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-09-024-19/+7
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| | |
| * | Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| | |
| * | Remove the annoying "Script saved" popups when saving scripts in taskMelanie Thielker2010-09-021-13/+1
| | | | | | | | | | | | | | | | | | | | | inventory. They cause spam when using recompile scripts in selection and are redundant because that message is also shown in the script window message pane. These popups were a legacy from when we couldn't drive the message pane and their finest hour has now come.
| * | Prevent Meta7 plants from being treated like dropped attachments and removedMelanie Thielker2010-09-011-1/+1
| | | | | | | | | | | | from the sim.
| * | Improve sim health reporting. Output error message if heartbeat thread is ↵Melanie Thielker2010-09-011-1/+2
| | | | | | | | | | | | restarted by scene. This may help to find out why this recovery mechanism isn't working.
| * | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-312-3/+4
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-313-3/+3
| | | | | | | | | | | | | | | | script state enum to reflect recent changes.
* | | | Fixes to JUMP system.Kitto Flora2010-09-022-54/+163
| |/ / |/| |
* | | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-3015-341/+622
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-3012-174/+113
| |\ \ | | |/
| | * Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-301-1/+2
| | | | | | | | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
| | * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-285-75/+84
| | |
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
| | |
| | * refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵Justin Clark-Casey (justincc)2010-08-261-47/+0
| | | | | | | | | | | | since this appears to relate solely to attachments
| | * refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-262-24/+21
| | | | | | | | | | | | | | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions.
| | * Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
| | |
| | * Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()Justin Clark-Casey (justincc)2010-08-261-2/+16
| | | | | | | | | | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
| * | Fix a horrible bug in SG, where iteration of scene objects is carriedMelanie Thielker2010-08-261-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-refactorMelanie2010-08-267-167/+265
| |\ \ | | |/ | | | | | | This was rather conflicted. Please test linking.
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-262-27/+38
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| | * | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵Justin Clark-Casey (justincc)2010-08-261-1/+1
| | | | | | | | | | | | | | | | always 0 (and any other number would cause an error anyway)
| | * | Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-266-136/+205
| | | | | | | | | | | | | | | | conditions in linking and unlinking
| | * | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
| | | | | | | | | | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
| | * | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵Justin Clark-Casey (justincc)2010-08-253-55/+82
| | | | | | | | | | | | | | | | SceneObjectPartInventory
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-255-75/+254
| |\ \ \ | | | |/ | | |/|
| | * | Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-252-18/+29
| | |/ | | | | | | | | | sticking around
| | * Split out actual scene object insertion code from Scene.Inventory.RezObject ↵Justin Clark-Casey (justincc)2010-08-243-25/+62
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * refactor: make RezObject() more readableJustin Clark-Casey (justincc)2010-08-241-69/+68
| | |
| | * add test to check move of task item to user inventory when a target folder ↵Justin Clark-Casey (justincc)2010-08-241-0/+26
| | | | | | | | | | | | is explicitly given
| | * minor: stop test using obsolete propertyJustin Clark-Casey (justincc)2010-08-241-1/+1
| | |
| | * refactor TestMoveTaskInventoryItemNoParent()Justin Clark-Casey (justincc)2010-08-241-24/+37
| | |
| | * Add automated test at the opensim 'api' level to check that a given item ↵Justin Clark-Casey (justincc)2010-08-242-1/+105
| | | | | | | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings
| * | Change object cleanup again. Make scene object directories more robust andMelanie Thielker2010-08-252-19/+30
| | | | | | | | | | | | prevent deleted SOP's from sticking around
| * | Correct a logic error in attachment cleanupMelanie Thielker2010-08-251-4/+9
| | |