aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (unfollow)
Commit message (Collapse)AuthorFilesLines
2011-10-25In Watchdog, add ability to specific timeout for a thread.Justin Clark-Casey (justincc)1-16/+56
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25Add m_threads dictionary locking to Watchdog.GetThreads()Justin Clark-Casey (justincc)1-1/+2
2011-10-25minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)1-0/+5
2011-10-25Add "threads abort <thread-id>" simulator console command that allows us to ↵Justin Clark-Casey (justincc)2-2/+48
abort a watchdog managed thread. This is for diagnostic purposes.
2011-10-25Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)13-64/+212
of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-24Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)1-12/+2
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2-5/+9
BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-22Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2-5/+6
This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-17refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵Justin Clark-Casey (justincc)1-2/+2
without a getter
2011-10-15move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵Justin Clark-Casey (justincc)1-5/+0
the others
2011-10-15fetch physical_prim switch from [Startup] config from inside scene, as is ↵Justin Clark-Casey (justincc)1-5/+2
done for most other scene config params
2011-10-15Restore [Startup] physical_prim flag which can stop any prims being subject ↵Justin Clark-Casey (justincc)1-0/+6
to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously.
2011-10-14refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵Justin Clark-Casey (justincc)1-1/+8
sends entity updates (including presence ones), not just prims.
2011-10-12Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2-38/+0
2011-10-07flip master version up to 0.7.3Justin Clark-Casey (justincc)1-1/+1
2011-10-03Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)1-3/+0
This appears to be code clutter since the code that uses this has long gone.
2011-10-03Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake1-2/+1
2011-09-30Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)1-1/+1
allow attachments to be temporarily turned off. This is for debugging purposes. Defaults to Attachments Enabled
2011-09-24Added a setting to [Startup] section of config that will allow the simulator ↵Kevin Houlihan & Michelle Argus2-21/+51
to start up with no regions configured. I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
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