aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | Merging in diva's locking fixesJohn Hurliman2009-10-062-29/+43
|\ \ | |/
| * Rewrote parts of the code that were double-locking different objects. This ↵Diva Canto2009-10-062-29/+43
| | | | | | | | is about half of the code base reviewed.
* | Added a debug line for nebadonJohn Hurliman2009-10-061-0/+3
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵John Hurliman2009-10-061-0/+16
|\ \ | |/ | | | | htb-throttle
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-061-6/+6
| |\
| | * Commenting the DEBUG code that I added yesterday, because it's causing mono ↵Diva Canto2009-10-061-6/+6
| | | | | | | | | | | | | | | | | | to fail with https://bugzilla.novell.com/show_bug.cgi?id=538854
| * | Lock the heartbeat against multiple invocations. May prevent deadlocks and/orMelanie2009-10-061-0/+10
| |/ | | | | | | runaway thread use
| * Correction on the DEBUG code.Diva Canto2009-10-051-4/+3
| |
| * #if DEBBUG code for monitoring the ThreadPool.Diva Canto2009-10-051-0/+7
| |
* | Fixing a few compile errors in the previous commitJohn Hurliman2009-10-061-2/+0
|/
* disable physics actors for flexible primsdahlia2009-10-041-3/+4
|
* Merge branch 'diva-textures-osgrid'Melanie2009-10-042-2/+2
|\
| * * Creates Util.UTF8 and switches some references of Encoding.UTF8 to ↵John Hurliman2009-10-022-2/+2
| | | | | | | | | | | | Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework) * Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
* | Merge branch 'master' into diva-texturesMelanie2009-10-023-51/+51
|\ \
| * | - cleaning up LandData/ILandObject capitalization issuesdr scofield (aka dirk husemann)2009-10-023-51/+51
| | | | | | | | | | | | - adding LandDataSerializer to OAR mechanics
* | | Merge branch 'master' into diva-texturesMelanie2009-10-0251-793/+592
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-10-021-12/+19
| |\
| | * Added messages to assertions in the failing tests, so that we know which ↵Diva Canto2009-10-011-12/+19
| | | | | | | | | | | | ones are failing.
| * | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-023-36/+16
| |/ | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| * Removed an innefficent List.Contains lookup from UpdateQueueJames J Greensky2009-09-301-5/+4
| | | | | | | | | | | | Changed the underlying data structure used to detected duplicate in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a List to a Dictionary.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3010-16/+16
| |\
| | * Formatting cleanup.Jeff Ames2009-10-0110-16/+16
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2009-09-3048-870/+702
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2009-10-0142-165/+165
| | |