aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-12-089-95/+117
|\ | | | | | | | | 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-089-73/+85
| | | | | | | | | | | | | | | | | | 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
| * Simplify Scene.AddNewClient()Justin Clark-Casey (justincc)2011-12-081-17/+28
| | | | | | | | | | If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway. So instead retain the check/create ScenePresence reference and use this.
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-12-087-57/+67
|\ \
| * \ Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-087-57/+67
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Remove unused SceneManager.TryGetAvatarsScene()Justin Clark-Casey (justincc)2011-12-071-20/+0
| | | | | | | | | | | | | | | It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
| | * On an Exception in Scene.RemoveClient(), always remove the client (and SP) ↵Justin Clark-Casey (justincc)2011-12-071-19/+28
| | | | | | | | | | | | structure so that logout on unexpired packets isn't retriggered, causing the same exception
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-071-0/+1
| | |\
| | | * Trigger a Jenkins buildBlueWall2011-12-071-0/+1
| | | |
| | * | Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-073-3/+42
| | |/ | | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
| | * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-17/+6
| | | | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
| | * Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ / | | | | | | a new queue object.
* | Fix intersim object give messagesMelanie2011-12-071-0/+6
| |
* | Fix up intersim give messagingMelanie2011-12-071-1/+41
| |
* | Fix task inventory givingMelanie2011-12-074-56/+39
| |
* | Remove harmless merge artefactMelanie2011-12-061-1/+1
| |
* | Fix phantom and temp flags not takingMelanie2011-12-062-2/+10
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-061-18/+128
|\ \ | |/
| * Make "show appearance" a synonym for "appearance show"Justin Clark-Casey (justincc)2011-12-061-2/+8
| |
| * In "appearance show", if a particular avatar is specified, print out texture ↵Justin Clark-Casey (justincc)2011-12-061-5/+35
| | | | | | | | UUID for each bake type and whether the simulator can find it.
| * Actually send the avatar data if an individual avatar is specified, rather ↵Justin Clark-Casey (justincc)2011-12-061-0/+2
| | | | | | | | than accidentally doing nothing
| * Allow "appearance show" command to take an optional avatar nameJustin Clark-Casey (justincc)2011-12-061-8/+40
| |
| * Make it possible to manually send appearance information via the "appearance ↵Justin Clark-Casey (justincc)2011-12-061-11/+42
| | | | | | | | send" command for a chosen avatar as well as all
| * Provide feedback as to which avatars are resending appearance informion on ↵Justin Clark-Casey (justincc)2011-12-061-2/+11
| | | | | | | | "appearance send" console command
* | Adapt GodsModule to core changesMelanie2011-12-051-2/+2
| |
* | Remove erroneous message about hyperlinks when entering an invalid region nameMelanie2011-12-051-2/+2
| | | | | | | | in map search.
* | Merge branch 'master' into bigmergeMelanie2011-12-0512-23/+23
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-054-65/+67
| |\
| | * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-65/+67
| | |
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0512-23/+23
| |/ | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Add the proper result code as per the LL announcement for ↵Melanie2011-12-051-1/+1
| | | | | | | | llTransferLindenDollars
* | Serialize the Volume Detect fieldMelanie2011-12-052-3/+9
| |
* | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-054-66/+67
|\ \ | | | | | | | | | into bigmerge
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-66/+67
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-12-0511-372/+460
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Split up test SceneHelpers to provide an AddChildScenePresence() callJustin Clark-Casey (justincc)2011-12-031-0/+1
| |
| * Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() ↵Justin Clark-Casey (justincc)2011-12-031-70/+5
| | | | | | | | since they don't do anything useful.
| * Extend TestCreateChildScenePresence to make assertions both at CreateAgent ↵Justin Clark-Casey (justincc)2011-12-031-0/+16
| | | | | | | | stage and then at Scene.AddClient()
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-033-16/+51
| | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵Justin Clark-Casey (justincc)2011-12-032-5/+3
| | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
| * Add agent circuit number checks to TestCloseAgent()Justin Clark-Casey (justincc)2011-12-031-0/+4
| |
| * Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7Justin Clark-Casey (justincc)2011-12-031-7/+5
| | | | | | | | | | We are returning the actual number of 'sides', not the maximum index number. Also minor format corrections.
| * Workaround for mesh to correct the number of faces in GetNumberOfSides(). ↵marc2011-12-031-1/+9
| | | | | | | | | | | | Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor(); Signed-off-by: marc <mare@sounddog.net>
| * 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-032-2/+75
| |
| * 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-032-23/+28
| | | | | | | | | | | | | | | | | | 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()
generated by cgit v1.1 at 2024-12-21 10:45:17 +0000