Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix intersim object give messages | Melanie | 2011-12-07 | 1 | -0/+6 |
| | |||||
* | Fix up intersim give messaging | Melanie | 2011-12-07 | 1 | -1/+41 |
| | |||||
* | Fix task inventory giving | Melanie | 2011-12-07 | 4 | -56/+39 |
| | |||||
* | Remove harmless merge artefact | Melanie | 2011-12-06 | 1 | -1/+1 |
| | |||||
* | Fix phantom and temp flags not taking | Melanie | 2011-12-06 | 2 | -2/+10 |
| | |||||
* | Merge branch 'master' into bigmerge | Melanie | 2011-12-06 | 4 | -27/+375 |
|\ | |||||
| * | Revert "Stop performing the asset save part of baked texture uploading on ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -9/+5 |
| | | | | | | | | | | | | | | | | | | the UploadBakedTexture cap asynchronously." This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..." Needs more investigation. This reverts commit 1854c52ea3c60d0a47f9793a7f5ec405e15489ca. | ||||
| * | Make "show appearance" a synonym for "appearance show" | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -2/+8 |
| | | |||||
| * | In "appearance show", if a particular avatar is specified, print out texture ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -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-06 | 1 | -0/+2 |
| | | | | | | | | than accidentally doing nothing | ||||
| * | Allow "appearance show" command to take an optional avatar name | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -8/+40 |
| | | |||||
| * | Make it possible to manually send appearance information via the "appearance ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -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-06 | 1 | -2/+11 |
| | | | | | | | | "appearance send" console command | ||||
| * | Add test for not found response from GetTexture cap handler. | Justin Clark-Casey (justincc) | 2011-12-05 | 2 | -0/+242 |
| | | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite | ||||
* | | Adapt GodsModule to core changes | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | |||||
* | | Remove erroneous message about hyperlinks when entering an invalid region name | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | | | | | | | in map search. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 55 | -103/+380 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-05 | 4 | -65/+67 |
| |\ | |||||
| * | | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 55 | -103/+380 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵ | Melanie | 2011-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | llTransferLindenDollars | ||||
* | | | Serialize the Volume Detect field | Melanie | 2011-12-05 | 2 | -3/+9 |
| | | | |||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -14/+25 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-12-05 | 1 | -14/+25 |
| |\ \ | | |/ | |||||
| | * | For the GetTexture capability, if a data range is requested that covers the ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -14/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whole asset length, return HTTP PartialContent instead of NotFound NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present. We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 Viewer 3.2.2 and very probably earlier appear happy with this. Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown. | ||||
| * | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 4 | -65/+67 |
| |/ | |||||
* | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-12-05 | 4 | -66/+67 |
|\ \ | | | | | | | | | | into bigmerge | ||||
| * | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 4 | -66/+67 |
| | | | |||||
* | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 25 | -451/+823 |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | HG: Added HEAD method to Helo service. This is the preferred method, but its ↵ | Diva Canto | 2011-12-04 | 2 | -1/+35 |
| | | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now. | ||||
| * | HG: Renamed one method | Diva Canto | 2011-12-04 | 5 | -5/+5 |
| | | |||||
| * | Split up test SceneHelpers to provide an AddChildScenePresence() call | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -10/+26 |
| | | |||||
| * | Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -70/+5 |
| | | | | | | | | since they don't do anything useful. | ||||
| * | Extend TestCreateChildScenePresence to make assertions both at CreateAgent ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -0/+16 |
| | | | | | | | | stage and then at Scene.AddClient() | ||||
| * | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence() | Justin Clark-Casey (justincc) | 2011-12-03 | 7 | -29/+85 |
| | | | | | | | | | | 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. | ||||
| * | Improve locking in AgentCircuitManager | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -25/+41 |
| | | |||||
| * | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 3 | -42/+57 |
| | | | | | | | | 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-03 | 1 | -0/+4 |
| | | |||||
| * | Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7 | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -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(). ↵ | marc | 2011-12-03 | 1 | -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-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 | 2 | -2/+75 |
| | | |||||
| * | 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 | ||||
| * | For now, disable mechanism to limit avatar animation updates since this ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -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() | ||||
| * | refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -14/+12 |
| | | | | | | | | than duplicating it with m_movementAnimation | ||||
| * | Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -1/+1 |
| | | | | | | | | asking for a new determination | ||||
| * | Do a cagent.Anims != null check in SP.CopyFrom() | Justin Clark-Casey (justincc) | 2011-12-03 | 1 | -1/+3 |
| | | |||||
| * | Rename ScenePresenceAnimator.GetMovementAnimation() -> ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -4/+9 |
| | | | | | | | | DetermineMovementAnimation() for better code readability | ||||
| * | Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being ↵ | Justin Clark-Casey (justincc) | 2011-12-03 | 2 | -12/+13 |
| | | | | | | | | | | | | | | 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-02 | 4 | -116/+133 |
| | | | | | | | | where such requests are ignored. |