| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -1/+2 |
| | | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 1 | -2/+4 |
| |\ | |||||
| | * | Fix bug where tapping home to stop falling would stop any avatar movement ↵ | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -2/+4 |
| | | | | | | | | | | | | | other than falling again. Addresses http://opensimulator.org/mantis/view.php?id=5839 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | commented out "Prevented flyoff" log message for now as this becomes ↵ | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed. | ||||
| * | | Fix camera orientation for sit targets to use the prim actually sat on. | Melanie | 2011-12-24 | 1 | -1/+1 |
| | | | | | | | | | Now SL compatible. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | And a typo fix | Melanie | 2011-12-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+6 |
| |\ \ | |/ | |||||
| | * | Add a few comments, correct a merge artefact | Melanie | 2011-12-22 | 1 | -1/+6 |
| | | | |||||
| | * | Harmonizing SP with Avination | Melanie | 2011-12-22 | 1 | -41/+55 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -117/+112 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Fixing a bug introduced yesterday. This put the precondition test inside ↵ | Diva Canto | 2011-12-22 | 1 | -105/+109 |
| | | | | | | | | | CheckForBorderCrossing the right way. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-12-21 | 1 | -4/+1 |
| | |\ | |||||
| | * | | Moved an external test into the method that uses those preconditions. | Diva Canto | 2011-12-21 | 1 | -19/+11 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-20 | 1 | -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-20 | 1 | -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/opensim | Diva Canto | 2011-12-20 | 1 | -8/+5 |
| | |\ | |||||
| | * | | Changed the async approach on close child agents. This may improve crossings ↵ | Diva Canto | 2011-12-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | a little bit. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -2/+5 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Stop sending the viewer its own AvatarAppearance packet. | Justin Clark-Casey (justincc) | 2011-12-19 | 1 | -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-19 | 1 | -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 careminster | Melanie | 2011-12-18 | 1 | -48/+43 |
| |\ \ \ | |/ / | |||||
| | * | | Stop generating client flags when we send out full object updates. | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -6/+0 |
| | |/ | | | | | | | These were entirely unused. | ||||
| | * | No functional changes. Changed the prefix of that log message [CONNECTION ↵ | Diva Canto | 2011-12-16 | 1 | -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-15 | 1 | -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/OdeCharacter | Justin Clark-Casey (justincc) | 2011-12-15 | 1 | -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 teleport | Melanie | 2011-12-12 | 1 | -24/+22 |
| | | | |||||
| * | | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 1 | -41/+49 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 1 | -41/+49 |
| | |\ \ | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 1 | -40/+49 |
| | | | | | | | | | | | | | IsColliding | ||||
| * | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 |
| |/ / | |||||
| * | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 1 | -0/+1 |
| | | | |||||
| * | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 1 | -119/+139 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 1 | -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-09 | 1 | -13/+2 |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 1 | -4/+0 |
| |\ \ | |/ | |||||
| | * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 1 | -3/+1 |
| |\ \ | |/ | |||||
| | * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -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 warnings | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -2/+0 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -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-08 | 1 | -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-08 | 1 | -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 bigmerge | Melanie | 2011-12-05 | 1 | -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-03 | 1 | -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-03 | 1 | -0/+4 |
| | | | | | | | | | called continuously even where there are no collisions | ||||
| | * | Add basic TestFlyingAnimation() regression test | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -2/+5 |
| | | | |||||
| | * | Stop calling Animator.UpdateMovementAnimations() at the end of ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | HandleAgentUpdate(). There's no point doing this if it's being called via PhysicsCollisionUpdate | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |