aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* * Added a sanity check to GetScriptAssemblies() and GetScriptStates() for ↵John Hurliman2009-10-201-10/+16
| | | | | | the case where no scripting engine is enabled * Added TokenBucket.cs to OpenSim, with some fixes for setting a more accurate MaxBurst value and getting a more accurate Content value (by Drip()ing each get)
* * Removed the unused m_agentUpdates collection and some extra work that was ↵John Hurliman2009-10-201-93/+33
| | | | | | being done for AgentUpdate packets * Start LLUDPClients unpaused (this variable is not being used yet)
* Reverting the deletion of files related to texture sending until we figure ↵John Hurliman2009-10-201-0/+58
| | | | out exactly what is and isn't needed
* * Removing cruft left over from the conversion to the new texture sending ↵John Hurliman2009-10-201-58/+0
| | | | | | and UDP code * Changing the cache modules to only initialize the caches if they are actually enabled. Should save a bit of resources from unused cache systems
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-191-2/+2
|\ | | | | | | prioritization
| * Formatting cleanup.Jeff Ames2009-10-191-2/+2
| |
* | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). ↵John Hurliman2009-10-195-58/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference * Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost * Reordered some comparisons on hot code paths for a minor speed boost * Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow) * Don't fire the queue empty callback for the Resend category * Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down * Rewrote some expensive math in LandObject.cs * Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible * Only update the attachment database when an object is attached or detached * Other small misc. performance improvements
* | * Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate ↵John Hurliman2009-10-183-36/+27
| | | | | | | | | | | | | | | | | | | | packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away * Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters * Made Parallel.ProcessorCount public * Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes() * More cleanup of the ScenePresences vs. ClientManager nightmare * ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
* | Committing the second part of Jim Greensky @ Intel Lab's patch, ↵John Hurliman2009-10-173-3/+124
| | | | | | | | re-prioritizing updates
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-161-3/+5
|\ \ | |/ | | | | prioritization
| * * One more tweak to inform the user that they may not be able to move until ↵Teravus Ovares (Dan Olivares)2009-10-161-3/+5
| | | | | | | | relogging.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-161-0/+11
|\ \ | |/ | | | | prioritization
| * * fix previous commitTeravus Ovares (Dan Olivares)2009-10-161-1/+1
| |
| * * Ensure that at least 20 frames run before letting avatar in.Teravus Ovares (Dan Olivares)2009-10-161-0/+11
| |
* | Updating OpenSim.ini.example with the section required to enable a useful ↵John Hurliman2009-10-161-0/+2
| | | | | | | | prioritization scheme
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-161-3/+14
|\ \ | |/ | | | | prioritization
| * * Make sure to unregister the OutOfBounds Physics event in ↵Teravus Ovares (Dan Olivares)2009-10-161-0/+1
| | | | | | | | RemoveFromPhysicalScene or we'll be leaking
| * * A hacky attempt at resolving mantis #4260. I think ODE was unable to ↵Teravus Ovares (Dan Olivares)2009-10-161-0/+9
| | | | | | | | | | | | allocate memory, and therefore the unmanaged wrapper call fails or worse.. there's some unmanaged resource accounting in the ODEPlugin for ODECharacter that isn't being done properly now. * The broken avatar may not be able to move, but it won't stop simulate from pressing on now. And, the simulator will try to destroy the avatar's physics proxy and recreate it again... but if this is what I think it is, it may not help.
| * * Request from lkalif to have the Sim send a coarselocationupdate for each ↵Teravus Ovares (Dan Olivares)2009-10-151-3/+4
| | | | | | | | | | | | | | avatar in the sim, including yourself. * Apparently the LLClientView should have been doing this previously.. Also fixed the 'You' on the index block.. so the client doesn't display an extra green dot. * Thanks lkalif for bringing it to our attention.
* | Object update prioritization by Jim Greensky of Intel Labs, part one. This ↵John Hurliman2009-10-159-54/+159
| | | | | | | | implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
* | * Removed some of the redundant broadcast functions in Scene and SceneGraph ↵John Hurliman2009-10-154-56/+15
|/ | | | | | | | so it is clear who/what the broadcast is going to each time * Removed two redundant parameters from SceneObjectPart * Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs) * Committing a preview of a new method for sending object updates efficiently (all commented out for now)
* * Replaced (possibly broken?) math for calculating the unix timestamp in ↵John Hurliman2009-10-143-6/+7
| | | | | | | MySQLAssetData with Utils.DateTimeToUnixTime() * Disabled UpdateAccessTime() function since it was only writing zeros anyways. This gave me a significant performance improvement for startup times and avatar logins in standalone mode * Load attachments asynchronously so avatars with lots of attachments don't have to race the timeout clock to login
* Merge branch 'master' into htb-throttleMelanie2009-10-141-0/+1
|\
| * Setting changeY in border crossing.Diva Canto2009-10-141-0/+1
| |
* | Merge branch 'master' into htb-throttleMelanie2009-10-145-75/+209
|\ \ | |/
| * * Fixes some prim crossings on megaregions with regions beyond the 512m markTeravus Ovares (Dan Olivares)2009-10-131-21/+93
| | | | | | | | * There's a slight chance that this could cause a problem with regular prim crossings.. but hopefully not. Revert if it does.
| * Added this one file for the previous commit to work.Diva Canto2009-10-121-0/+37
| |
| * * Fixes http://opensimulator.org/mantis/view.php?id=4225Diva Canto2009-10-123-54/+79
| | | | | | | | | | * Fixes http://opensimulator.org/mantis/view.php?id=3959 * Allows for viewing inventory textures outside home grid
* | Optimized heartbeat by calling Update() only on updated objects.Dan Lake2009-10-133-73/+52
| | | | | | | | | | | | | | | | During the heartbeat loop, Update() is called on every SceneObjectGroup which in turn checks if any SceneObjectPart has changed. For large regions (> 100k prims) this work consumes 20-30% of a CPU even though there are only a few objects updating each frame. There is only one other reason to check every object on every frame, and that is the case where a script has registered the object with an "at target" listener. We can easily track when an object is registered or unregistered with an AtTarget, so this is not a reason to check every object every heartbeat. In the attached patch, I have added a dictionary to the scene which tracks the objects which have At Targets. Each heartbeat, the AtTarget() function will be called on every object registered with a listener for that event. Also, I added a dictionary to SceneGraph which stores references to objects which have been queued for updates during the heartbeat. At each heartbeat, Update() is called only on the objects which have generated updates during that beat.
* | * Consolidated adding / removing ClientManager IClientAPIs to two places in ↵John Hurliman2009-10-131-0/+4
| | | | | | | | | | | | | | | | Scene * Added some missing implementations of IClientAPI.RemoteEndPoint * Added a ClientManager.Remove(UUID) overload * Removed a reference to a missing project from prebuild.xml
* | * Rewrote ClientManager to remove Lindenisms from OpenSim core, improve ↵John Hurliman2009-10-132-4/+4
| | | | | | | | | | | | | | | | performance by removing locks, and replace LLUDPClientCollection * Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close() * Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients * Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
* | * Unregister event handlers in LLUDPServer when a client logs out and ↵John Hurliman2009-10-134-20/+28
| | | | | | | | | | | | | | | | disconnects * Move ViewerEffect handling to Scene.PacketHandlers * Removing the unused CloseAllAgents function * Trimming ClientManager down. This class needs to be reworked to keep LLUDP circuit codes from intruding into the abstract OpenSim core code
* | Merge branch 'master' into htb-throttleMelanie2009-10-121-56/+54
|\ \ | |/
| * Fixed tree crossing. This will alleviateDiva Canto2009-10-111-56/+54
| | | | | | | | http://opensimulator.org/mantis/view.php?id=4163
* | Merge branch 'master' into htb-throttleMelanie2009-10-101-4/+11
|\ \ | |/ | | | | | | This is hand-edited to not let master changes creep into here and may cause a somewhat rocky merge to master later.
| * * comment out the velocity test, using updates every 500 ms as set in ↵Teravus Ovares (Dan Olivares)2009-10-101-2/+4
| | | | | | | | | | | | | | ScenePresence.AddToPhysicalScene. * This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms. * This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-10-101-1/+1
| |\
| | * Adjust velocity threshold for triggering flailing. Thanks to KittoFlora for ↵dahlia2009-10-101-1/+1
| | | | | | | | | | | | researching this.
| * | * Make ODECharacter respect the scene's requested collision update timeTeravus Ovares (Dan Olivares)2009-10-101-1/+1
| |/ | | | | | | * Set the Scene collision update time to 500 ms
| * * Fix incorrect math on the Velocity check in PhysicsCollisionUpdate. This ↵Teravus Ovares (Dan Olivares)2009-10-101-1/+1
| | | | | | | | may reduce avatar flailing.
| * * Move the 'On Collision Update Movement Animation' routine to above the ↵Teravus Ovares (Dan Olivares)2009-10-101-3/+8
| | | | | | | | 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
* | Change the backup thread to run on a BackgroundWorker instead of a Thread. I ↵John Hurliman2009-10-091-4/+4
|/ | | | don't have an explanation, but this seems to stop a slow but steady memory leak I was experiencing
* Merge branch 'master' into htb-throttleMelanie2009-10-071-1/+2
|\
| * A small change in FetchInventoryDescendantsCAPS.Diva Canto2009-10-061-1/+2
| |
| * Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-061-3/+3
| |
* | Uncommented log message on CAPs FetchInventoryDescendantsDiva Canto2009-10-071-3/+3
| |
* | Merge branch 'master' into htb-throttleMelanie2009-10-071-0/+1
|\ \ | |/
| * * One more debug message on FetchInventoryDescendantsDiva Canto2009-10-061-0/+1
| | | | | | | | * More streams close on finally
| * Revert "Rewrote parts of the code that were double-locking different ↵Melanie2009-10-072-43/+29
| | | | | | | | | | | | objects. This is about half of the code base reviewed." This reverts commit e992ca025571a891333a57012c2cd4419b6581e5.
* | Revert "Merging in diva's locking fixes"Melanie2009-10-072-43/+29
| | | | | | | | This reverts commit 832cc685138b2244529f10b54b373c34adb4a633.