aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-201-5/+5
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Though the viewer warns about receiving this, not sending appears to break ↵Justin Clark-Casey (justincc)2011-12-201-4/+1
| | | | | | | | | | | | | | | | | | | | baked texture caching when crossing region boundaries. Needs further investigation. Revert "Stop sending the viewer its own AvatarAppearance packet." This reverts commit 92039f295d7fe66bf1a09b29483f9057e395839e.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-201-8/+5
| |\
| * | Changed the async approach on close child agents. This may improve crossings ↵Diva Canto2011-12-161-1/+4
| | | | | | | | | | | | a little bit.
* | | Merge branch 'master' into careminsterMelanie2011-12-191-2/+5
|\ \ \ | | |/ | |/|
| * | Stop sending the viewer its own AvatarAppearance packet.Justin Clark-Casey (justincc)2011-12-191-1/+4
| | | | | | | | | | | | | | | The viewer warns in the log if it receives this. Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
| * | Migrate detailed "appearance show" report generation up to ↵Justin Clark-Casey (justincc)2011-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive). Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25. Adjust some method doc Minor changes to some logging messages.
* | | Merge branch 'master' into careminsterMelanie2011-12-181-48/+43
|\ \ \ | |/ /
| * | Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-161-6/+0
| |/ | | | | | | These were entirely unused.
| * No functional changes. Changed the prefix of that log message [CONNECTION ↵Diva Canto2011-12-161-9/+9
| | | | | | | | | | | | BEGIN] to [SCENE] because that's where the message happens. Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
| * Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() ↵Justin Clark-Casey (justincc)2011-12-151-6/+2
| | | | | | | | | | | | when we've already passed size information to the avatar at PhysicsScene.AddAvatar() Eliminate some copypasta for height setting in OdeCharacter
| * Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacterJustin Clark-Casey (justincc)2011-12-151-27/+32
| | | | | | | | | | | | Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly. Add commented out log lines for future use. Use automatic property for PhysicsActor for better code readability and simplicity
* | Prevent a nasty deadlock on teleportMelanie2011-12-121-24/+22
| |
* | Make m_attachments privateMelanie2011-12-121-1/+1
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2011-12-121-41/+49
|\ \
| * \ Merge branch 'master' into careminsterMelanie2011-12-121-41/+49
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵Dan Lake2011-12-121-40/+49
| | | | | | | | | | | | IsColliding
* | | Send changed animation event asynchronouslyMelanie2011-12-121-14/+17
|/ /
* | Fix a regression that causes data from the attachments module to fail loadingMelanie2011-12-101-0/+1
| |
* | Prevent spurious error message when client tries to move a null itemMelanie2011-12-101-119/+139
| |
* | Merge branch 'master' into careminsterMelanie2011-12-101-13/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵Justin Clark-Casey (justincc)2011-12-091-13/+2
| | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
* | Merge branch 'master' into careminsterMelanie2011-12-091-4/+0
|\ \ | |/
| * remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2011-12-091-4/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-091-3/+1
|\ \ | |/
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-081-1/+1
| | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-12-081-2/+0
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-081-14/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * When a client connects to a scene, send other avatar appearance data ↵Justin Clark-Casey (justincc)2011-12-081-6/+6
| | | | | | | | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send.
| * On a new client circuit, send the initial reply ack to let the client know ↵Justin Clark-Casey (justincc)2011-12-081-14/+25
| | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
* | Merge branch 'master' into bigmergeMelanie2011-12-051-47/+56
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Update SP.PhysicsCollisionUpdate() doc.Justin Clark-Casey (justincc)2011-12-031-2/+5
| | | | | | | | It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface
| * Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's ↵Justin Clark-Casey (justincc)2011-12-031-0/+4
| | | | | | | | called continuously even where there are no collisions
| * Add basic TestFlyingAnimation() regression testJustin Clark-Casey (justincc)2011-12-031-2/+5
| |
| * Stop calling Animator.UpdateMovementAnimations() at the end of ↵Justin Clark-Casey (justincc)2011-12-031-2/+2
| | | | | | | | | | | | HandleAgentUpdate(). There's no point doing this if it's being called via PhysicsCollisionUpdate
| * For now, disable mechanism to limit avatar animation updates since this ↵Justin Clark-Casey (justincc)2011-12-031-23/+23
| | | | | | | | | | | | | | | | | | causes avatars to never reach the correct animation after some actions. This reverts to situation where animation updates are made each frame on SP.PhysicsCollisionUpdate (though a packet is only sent if the anim actually changes). m_updateCount was not being update on various avatar state changes, causing the correct animations to never be sent. Always setting in HandleAgentUpdate() is not enough since the avatar is continually sending AgentUpdate packets. One would need to identify all the conditions under which animations need to play out and set m_updateCount appropriately in SP.HandleAgentUpdate()
| * Do a cagent.Anims != null check in SP.CopyFrom()Justin Clark-Casey (justincc)2011-12-031-1/+3
| |
| * Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being ↵Justin Clark-Casey (justincc)2011-12-031-4/+7
| | | | | | | | | | | | | | processed if we're dealing with a child ScenePresence. Neither of these can have any effect on child agents Now leaving warning about trying to set animation on a child agent active. Might temporarily pop up now and again.
| * Stop some places where we're trying to reset animations in child agents ↵Justin Clark-Casey (justincc)2011-12-021-14/+11
| | | | | | | | where such requests are ignored.
| * Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece ↵Justin Clark-Casey (justincc)2011-12-021-3/+0
| | | | | | | | | | | | constructor. Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
* | Reinstate setter for OffsetPosition to allow setting the offset by scriptMelanie2011-12-051-0/+7
| | | | | | | | while seated
* | Don't allow position update on sitting avatar. Don't bounds check sittingMelanie2011-12-041-2/+9
| | | | | | | | avatars as they will be crossed by the vehicle and not individually
* | Merge branch 'master' into bigmergeMelanie2011-11-241-13/+13
|\ \ | |/
| * Stop an exception being thrown and a teleport/border cross failing if the ↵Justin Clark-Casey (justincc)2011-11-221-13/+13
| | | | | | | | | | | | | | desintation sim has no active script engines. This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry. Callers adjusted to stop checking for the list reference being null (which never happened anyway)
* | Merge branch 'master' into bigmergeMelanie2011-11-171-4/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵Justin Clark-Casey (justincc)2011-11-161-1/+1
| | | | | | | | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday
| * Add comments about trying to avoid synchronous work off the ↵Justin Clark-Casey (justincc)2011-11-151-0/+3
| | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
| * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵Justin Clark-Casey (justincc)2011-11-151-3/+6
| | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead
* | Merge branch 'master' into bigmergeMelanie2011-11-141-28/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-141-28/+0
| |\
generated by cgit v1.1 at 2025-01-06 13:11:48 +0000