5b07370ec4
Remove erroneous message about hyperlinks when entering an invalid region name
...
in map search.
2011-12-05 21:26:06 +01:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
47d0a50a19
Add the proper result code as per the LL announcement for llTransferLindenDollars
2011-12-05 20:02:27 +01:00
e7cb63fcf7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-12-05 19:01:35 +00:00
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
37889eb3fa
For the GetTexture capability, if a data range is requested that covers the 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.
2011-12-05 18:35:03 +00:00
6362df1202
Serialize the Volume Detect field
2011-12-05 19:33:25 +01:00
1ece4feccd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-12-05 19:08:19 +00:00
cc482ee865
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-05 18:54:31 +00:00
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
3281b99362
Strip CR from http responses and limit them to 2048 chars
2011-12-05 15:57:47 +01:00
b7c9eb4bf7
Don't allow deletion of a terrain from the database unless we have one to replace it with
2011-12-05 15:46:57 +01:00
68bdd0b7fe
Fix setting seated avatar position and make llSameGroup work as in SL.
2011-12-05 15:26:49 +01:00
35800d6a86
Reinstate setter for OffsetPosition to allow setting the offset by script
...
while seated
2011-12-05 15:26:22 +01:00
19d6aa2bc9
Don't allow position update on sitting avatar. Don't bounds check sitting
...
avatars as they will be crossed by the vehicle and not individually
2011-12-04 20:16:07 +01:00
a2d98c7293
HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now.
2011-12-04 10:10:09 -08:00
080dfcc9c9
HG: Renamed one method
2011-12-04 08:24:16 -08:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
a4d82895be
Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful.
2011-12-03 19:14:37 +00:00
3852f05e6e
Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient()
2011-12-03 19:10:32 +00:00
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
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.
2011-12-03 18:59:54 +00:00
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
aac3f2d04e
Add agent circuit number checks to TestCloseAgent()
2011-12-03 16:04:11 +00:00
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). 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>
2011-12-03 15:49:19 +00:00
6541fc08d4
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 22:46:37 -05:00
585fc5e79d
Update SP.PhysicsCollisionUpdate() doc.
...
It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface
2011-12-03 02:51:17 +00:00
e26ef8aeca
change misleading login = http://127.0.0.1:9000/ in GridInfoService in Robust.ini.example to 8002
2011-12-03 02:48:16 +00:00
b66fe3e9ff
Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's called continuously even where there are no collisions
2011-12-03 02:45:02 +00:00
a009871827
Add basic TestFlyingAnimation() regression test
2011-12-03 02:39:21 +00:00
feef1dd732
Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpdate().
...
There's no point doing this if it's being called via PhysicsCollisionUpdate
2011-12-03 02:05:11 +00:00
f144baa9a8
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 20:53:35 -05:00
f08aad8a40
For now, disable mechanism to limit avatar animation updates since this 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()
2011-12-03 01:47:12 +00:00
b94ab10922
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 20:21:35 -05:00
0ca8491bbe
refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than duplicating it with m_movementAnimation
2011-12-03 00:40:08 +00:00
5bbfb082dd
Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than asking for a new determination
2011-12-03 00:33:24 +00:00
8185ce8b4a
Do a cagent.Anims != null check in SP.CopyFrom()
2011-12-03 00:30:13 +00:00
5ba8ca5662
Rename ScenePresenceAnimator.GetMovementAnimation() -> DetermineMovementAnimation() for better code readability
2011-12-03 00:27:21 +00:00
96c191f4fd
Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being 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.
2011-12-03 00:09:18 +00:00
21f4ee8a3d
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 18:57:57 -05:00
054ebe8878
Stop some places where we're trying to reset animations in child agents where such requests are ignored.
2011-12-02 23:56:01 +00:00
2a6597f61e
Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece constructor.
...
Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
2011-12-02 22:14:47 +00:00
1854c52ea3
Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.
...
This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service.
The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients.
The race condition seems unlikely because of this delay but it's still possible.
Might help with grey avatar appearances.
2011-12-01 23:38:25 +00:00
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
516c3dfbbb
Remove some debug code that had snuck in
2011-12-01 16:12:09 +01:00
797982ee11
Implement llTransferLindenDollars
2011-12-01 13:30:10 +01:00
8f2d7881bd
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-01 11:56:40 +01:00
Melanie