aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (unfollow)
Commit message (Collapse)AuthorFilesLines
2011-09-23Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2-0/+3
When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
2011-09-22Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)1-1/+1
This is moved into ScenePresence for now as a general facility
2011-09-16Updated some variables to be closer to the coding standards (and easier to ↵Kevin Houlihan1-91/+88
understand). There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix. I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used.
2011-09-16Passwords could be revealed in console by pressing backspace.Kevin Houlihan1-1/+4
Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press.
2011-09-13In an object return message, send a null-terminated empty string in binary ↵Justin Clark-Casey (justincc)1-2/+40
bucket to prevent a viewer 3 crash. This is the message sent to the client when the object is returned. We were sending byte[0] in the binary bucket. This didn't kill viewer 1 but did terminate viewer 3 (don't know about viewer 2). So sending "\0" instead. This is to address http://opensimulator.org/mantis/view.php?id=5683
2011-09-12lock AvatarAppearance.m_attachments when we use itJustin Clark-Casey (justincc)1-33/+58
This is partly to address http://opensimulator.org/mantis/view.php?id=5644, though something more thorough is needed.
2011-09-10lock attachments when enumerating through them in ScenePresence.CopyTo().Justin Clark-Casey (justincc)1-1/+0
May have some effect on http://opensimulator.org/mantis/view.php?id=5644
2011-09-06In SetAttachment, if the existing attachment has no asset id then carry on ↵Justin Clark-Casey (justincc)2-3/+34
rather than abort. When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However, the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments later fail unless the attachment is detached and reattached. Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
2011-09-06Stop the pointless double setting of every attachment in AvatarAppearance.Justin Clark-Casey (justincc)1-4/+10
The second was already being filtered out so this has no user level effect
2011-09-03Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2-3/+14
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
2011-08-31If a FireAndForget thread terminates with an exception, then catch and log ↵Justin Clark-Casey (justincc)1-1/+15
rather than letting it terminate the simulator. Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)
2011-08-30add Name property to ISceneEntityJustin Clark-Casey (justincc)1-0/+1
2011-08-30refactor: migrate DropObject handling fully into AttachmentsModule from SceneJustin Clark-Casey (justincc)1-1/+1
2011-08-30Fix bug where attachments were remaining on the avatar after being dropped.Justin Clark-Casey (justincc)1-2/+5
If the inventory service is configured not to allow deletion then these will not disappear from inventory
2011-08-28Move GetMeshKey from buried inside Meshmerizer to a public method on ↵Robert Adams1-0/+61
PrimitiveBaseShape Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-22read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)1-2/+4
2011-08-22oops, fix build break from last commitJustin Clark-Casey (justincc)1-12/+8
2011-08-22improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-10/+10
2011-08-22improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-2/+2
2011-08-22improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-2/+4
2011-08-22remove necessity to catch a KeyNotFoundException in ↵Justin Clark-Casey (justincc)1-11/+6
BaseHttpServer.RemoveLLSDHandler()
2011-08-22improve locking of m_llsdHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-30/+32
2011-08-22minor: remove mono compiler warningJustin Clark-Casey (justincc)1-3/+3
2011-08-22improve locking of m_rpcHandlers in BaseHttpServerJustin Clark-Casey (justincc)1-1/+2
2011-08-18Don't try to save changed attachment states when an NPC with attachments is ↵Justin Clark-Casey (justincc)2-3/+43
removed from the scene. This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc. This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-16Add new FireAndForgetMethod.None.Justin Clark-Casey (justincc)2-3/+20
This executes the callback on the same thread that made the request. Designed for use only by regression tests that rely on a predicable event ordering.
2011-08-10early code to allow scripts to force npcs not to fly when moving to targetJustin Clark-Casey (justincc)1-1/+1
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path. currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10Stop trying to deregister caps or close child agents when an NPC is removedJustin Clark-Casey (justincc)1-1/+12
2011-08-09When an NPC is created, stop telling neighbouring regions to expect a child ↵Justin Clark-Casey (justincc)1-1/+1
agent
2011-08-09Implement first draft functions for saving and loading NPC appearance from ↵Justin Clark-Casey (justincc)1-1/+1
storage. This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent. By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type. Notecards also allow different appearances to be swapped and manipulated easily. This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text. This works in my basic test but is not at all ready for user use or bug reporting yet.
2011-08-06rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)1-4/+4
2011-08-03get rid of vestigal move to parametersJustin Clark-Casey (justincc)1-1/+1
2011-08-02Get rid of AvatarAppearance.Owner to simplify the code.Justin Clark-Casey (justincc)5-33/+19
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
2011-08-01Get osNpcCreate appearance working with avatars that are currently in the scene.Justin Clark-Casey (justincc)1-1/+5
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing). Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing. Extended TestCreate() to check this.
2011-07-31In the packetpool, if we encounter a data block that somehow wasn't ↵Justin Clark-Casey (justincc)1-6/+11
retrieved via GetDataBlock() then create a new stack instead of throwing an exception
2011-07-29For all Util.FireAndForget invocations, set thread to en_US before ↵Justin Clark-Casey (justincc)1-5/+10
continuing wtih the invocation. This is to avoid bugs where the locale is not manually set on the thread and bad data values get sent to the database or over the wire. Lots of code does this manually but as we've seen, a subtle change can hit code which has forgotton to do this. Since en_US show be used throughout the server at present, setting it at FireAndForget seems reasonable. Arguably, it would be better to do this where data is sent, but doing it here is much easier. All the manual BeginInvokes() remaining in the code should probably call FireAndForget instead.
2011-07-23Fix LLTextBox to work with the updated libOMVMelanie1-1/+1
2011-07-23Fix LLTextBox to work with the updated libOMVMelanie1-1/+1
2011-07-23Pass the first name and last name from the agent circuit data to the ↵Justin Clark-Casey (justincc)1-1/+1
authorization service rather than from the account. This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account. See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure. It's up to the auth service to decide which data it actually uses. Possibly we should be passing through other info such as agent circuit ip
2011-07-23Remove manually permissions settings on all current library items so that ↵Justin Clark-Casey (justincc)1-1/+7
they use the defaults instead. Some items had completely wrong permissions - this is easier than correcting them all. The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
2011-07-23Revert "Don't load current/next/everyone/base permissions from the library ↵Justin Clark-Casey (justincc)1-7/+1
item xml files - always use PermissionMask.All instead (which was the existing default)." There actually are uses for this. I will correct the perms instead since some entries appear to be wrong. This reverts commit 667b54f5a2a04fa5a2859397868d270eab3913f1.
2011-07-23Don't load current/next/everyone/base permissions from the library item xml ↵Justin Clark-Casey (justincc)1-1/+7
files - always use PermissionMask.All instead (which was the existing default). Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
2011-07-22Fix merge artefactMelanie1-3/+0
2011-07-22Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie1-1/+4
from XML properly.
2011-07-22Thank you, Michelle Argus, for a patch that adds reading the agent limitMelanie1-1/+4
from XML properly.
2011-07-21Fixed updating avatar appearanceOren Hurvitz1-1/+3
Signed-off-by: root <root@grid00001.t-data.com>
2011-07-18use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)1-152/+0
remove OpenSim.Framework.UndoStack
2011-07-18Use a standard generic system stack for the undo/redo stacks instead of our ↵Justin Clark-Casey (justincc)1-1/+39
own homebrew. system stack also uses an array, so no performance penalty. Also exposes undo count and adds a test assertion for correct undo count after resize
2011-07-13minor: remove whitespaceJustin Clark-Casey (justincc)1-1/+0
2011-07-13Remove an unused 404 checker since on a 404, GetResponse() throws a ↵Justin Clark-Casey (justincc)1-3/+0
WebException rather than proceeding.