aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-171-0/+11
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-141-0/+11
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-142-55/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-141-50/+0
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-50/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prim update to only triple queuing. Existing method was: 1. Schedule prim for update, adding to scene update list 2. Update on SOGs during heartbeat queues update onto each SceneViewer 3. Update on SPs during heartbeat queues update onto each IClientAPI 4. ProcessEntityUpdates queues updates into UDP send stack Now the SceneViewer has been eliminated so updates are scheduled at any time and then put onto the IClientAPI priority queues immediately during SceneGraph.UpdateObjectGroups.
| * | Improved method doc for AddFriend() - it actually does set up a two-way ↵Justin Clark-Casey (justincc)2011-11-141-5/+2
| | | | | | | | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship()
* | | Merge branch 'master' into bigmergeMelanie2011-11-141-0/+14
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-0/+14
| |/
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line ↵Dan Lake2011-10-191-2/+2
| | | | | | | | endings from previous commit.
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-191-5/+9
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-251-3/+6
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ↵Dan Lake2011-10-191-3/+6
| | | | | | | | | | | | scene presence by client ID.
* | | Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmergeMelanie2011-10-251-5/+9
|\ \ \ | | |/ | |/|
| * | Extend scripts stop/start/suspend/resume console commands to allow action on ↵Justin Clark-Casey (justincc)2011-10-191-5/+9
| |/ | | | | | | | | | | a single script by giving the script item id (which can be found via scripts show). Not an ideal way to do this on a region with many scripts. Needs refinement later.
* | Merge commit 'de161585c0960a93911f446f0179441ba5470245' into bigmergeMelanie2011-10-251-0/+8
|\ \ | |/
| * Implement osNpcStand(<npc-id>)Justin Clark-Casey (justincc)2011-10-171-0/+8
| | | | | | | | Allows you to stand an NPC that has sat.
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-251-0/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-171-0/+9
| | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :)
* | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-121-27/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵Dan Lake2011-10-041-22/+9
| | | | | | | | handlers for attachments to call public interface and rearranged module file into sections
* | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-111-29/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant code in AttachmentsModule and simplified interfaces which ↵Dan Lake2011-10-031-29/+6
| | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still.
* | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-111-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
| * Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-031-2/+2
| |
* | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-111-0/+9
|\ \ | |/
| * minor: remove clutter null check from pass in config to ↵Justin Clark-Casey (justincc)2011-10-011-0/+9
| | | | | | | | | | | | AvatarFactoryModule.Initialize() This is never null
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-112-1/+17
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-162-1/+17
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Bring us up to date.Tom2011-09-145-18/+86
|\ \ | |/
| * Remove UpdateKnownItem() from IAttachmentsModule.Justin Clark-Casey (justincc)2011-09-131-9/+0
| | | | | | | | It's not appropriate for code outside the attachments module to call this.
| * comment out some recent terrain texture loggingJustin Clark-Casey (justincc)2011-09-121-1/+1
| |
| * Start locking entire add/remove operations on an ↵Justin Clark-Casey (justincc)2011-09-122-0/+17
| | | | | | | | | | | | | | | | | | IScenePresence.AttachmentsSyncLock object Attach and detach packets are processed asynchronously when received from a viewer. Bugs like http://opensimulator.org/mantis/view.php?id=5644 indicate that in some situations (such as attaching/detaching entire folders of objects at once), there are race conditions between these threads. Since multiple data structures need to be updated on attach/detach, it's not enough to lock the individual collections. Therefore, this commit introduces a new IScenePresence.AttachmentsSyncLock which add/remove operations lock on.
| * When creating an OAR, optionally exclude objects according to their permissionsOren Hurvitz2011-09-121-0/+54
| |
| * Delay loading scripts until the scene has finished loadingOren Hurvitz2011-09-091-0/+5
| |
| * Comment out unused ISceneViewer.Reset() to reduce code complexityJustin Clark-Casey (justincc)2011-09-061-1/+1
| |
| * In SceneViewer, introduce an IsEnabled flag and perform Close() under an ↵Justin Clark-Casey (justincc)2011-09-061-1/+10
| | | | | | | | m_pendingObjects lock in order to avoid the race condition seen by danbanner in http://opensimulator.org/mantis/view.php?id=5669
| * Get rid of the confusing version of ↵Justin Clark-Casey (justincc)2011-09-061-14/+0
| | | | | | | | IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
* | Merge fixes, and fix the buildTom2011-09-141-1/+1
| |
* | Resolve merge commits, stage 1Tom2011-09-048-34/+370
|\ \ | |/
| * Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-032-4/+57
| | | | | | | | | | | | | | This was happening because we were using the source avatar's item IDs in the clone appearance. Switch to using the asset IDs of attachments instead for NPCs. The InventoryAccessModule and AttachmentModule had to be changed to allow rezzing of an object without an associated inventory item. Hopefully goes some way towards resolving http://opensimulator.org/mantis/view.php?id=5653
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-312-2/+24
| |
| * Make SP.Attachments available as sp.GetAttachments() instead.Justin Clark-Casey (justincc)2011-08-311-2/+5
| | | | | | | | | | | | | | The approach here, as in other parts of OpenSim, is to return a copy of the list rather than the attachments list itself This prevents callers from forgetting to lock the list when they read it, as was happening in various parts of the codebase. It also improves liveness. This might improve attachment anomolies when performing region crossings.
| * refactor: move SP.SaveChangedAttachments() fully into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-302-0/+17
| |
| * refactor: Move ScenePresence.RezAttachments() into AttachmentsModuleJustin Clark-Casey (justincc)2011-08-302-0/+62
| | | | | | | | This adds an incomplete IScenePresence to match ISceneEntity
| * refactor: migrate DropObject handling fully into AttachmentsModule from SceneJustin Clark-Casey (justincc)2011-08-301-4/+4
| |
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-301-0/+17
| | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
| * refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene ↵Justin Clark-Casey (justincc)2011-08-261-2/+2
| | | | | | | | object group direct
| * rename AttachmentsModule.ShowDetachInUserInventory() to ↵Justin Clark-Casey (justincc)2011-08-231-15/+7
| | | | | | | | DetachSingleAttachmentToInv() for consistency and to reflect it's actual behaviour
| * If an attachment fails, then start logging the exception for now, in order ↵Justin Clark-Casey (justincc)2011-08-221-5/+3
| | | | | | | | | | | | to help with the inconsistent state bug. This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required.
generated by cgit v1.1 at 2024-12-22 23:14:34 +0000