f0a6ec151a
*UNTESTED* let SetPrimParams for avatars parse even unsupported parameters so that if a supported one is in the middle of then it still works.
2012-06-08 15:27:21 +01:00
9d878591c8
*UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for avatars. Stopped setting position twice in normal SetPrimParams
2012-06-08 14:29:02 +01:00
21c3cf3dc3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-08 15:16:20 +02:00
dadac6816b
Merge branch 'ubitwork' into avination
2012-06-08 15:15:17 +02:00
2d98d6354c
Add a frame based watchdog function to keyframed motion
2012-06-08 15:14:38 +02:00
e7731961a8
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-06-08 14:55:17 +02:00
794d184c25
Stop sending a DisableSimulator packet in LLClientView.Close(), which is a duplicate for child agents and unnecessary for root agents.
...
Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
2012-06-08 04:32:51 +01:00
f94b92df46
Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead.
...
This is slightly better thread-race wise
2012-06-08 04:12:22 +01:00
c215b1ad16
If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.
...
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
2012-06-08 03:53:03 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
22906386b4
Replace the stock libomv with our home grown 0.9.1 with the texture bug fixed.
2012-06-08 03:25:51 +02:00
d73805d7f4
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
2012-06-08 01:51:28 +01:00
d71c6dea7e
Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue.
...
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
2012-06-08 01:43:58 +01:00
30f4a33f01
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
...
This is always done as part of Scene.RemoveClient()
Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
2012-06-08 01:26:43 +01:00
8ebe2cd3da
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 01:12:37 +01:00
5c162ccd57
Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly.
...
This no longer double counts child agent removals
2012-06-08 00:59:39 +01:00
48add77a4c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 00:43:39 +01:00
d547bcf8d1
Remove duplicate update of user count in Scene.IncomingCloseAgent()
...
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
2012-06-08 00:40:38 +01:00
af2954898e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-08 00:24:39 +01:00
b56673c920
Fix bug with "kick user" reducing agent counts by 2 instead of 1.
...
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
2012-06-08 00:18:25 +01:00
c5af3e384c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2012-06-08 00:14:39 +01:00
0c5fefacb4
Record the fact that child agents can have asset transactions.
...
Also change code to grab the agent asset transaction module once.
2012-06-07 23:51:04 +01:00
de87e4871b
Don't send kill object messages to clients when a child agent is closed.
2012-06-07 23:35:21 +01:00
39cb2063bf
Add collision sounds to the asset set
2012-06-07 23:35:08 +01:00
69dd5b855a
Merge branch 'avination' into careminster
2012-06-07 23:34:22 +01:00
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
038acc39be
Cut off collision sounds with avatar at 3.2. This makes most walkig collisions
...
with walls and stairs silent. Falls from greater height and running into things
will still be heard. a CollisionSound defined for the object will override this
so one can still script a soccer ball with sounds.
2012-06-08 00:09:30 +02:00
ad1df33006
Further limit the amount of avatar collisions that will actually trigger
...
sounds. They are distracting.
2012-06-07 23:41:10 +02:00
b700f58d5e
Typo fix
2012-06-07 23:41:00 +02:00
26c5b32988
Add the ability to query the MYSQL databse for a list of the stored prim UUIDs
2012-06-07 22:39:03 +02:00
4942314435
Implement playing of the real collision sounds, change scaling for avatar
...
collisions to make them really soft because otherwise climbing stairs
makes an unbearable amount of noise.
2012-06-07 20:51:03 +02:00
095dbf0ece
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-07 19:51:32 +02:00
354ac8c978
Add collision sounds to the asset set
2012-06-07 19:02:43 +02:00
f5cbe56c56
Make not_at_target stop when the target is reached even if the script
...
is not listening to at_target
2012-06-07 19:01:33 +02:00
31bc9c3ad3
Typo correction
2012-06-07 18:04:09 +02:00
64aefe9c28
Disable default collision sounds until they can be uploaded, but enable custom ones
2012-06-07 17:59:38 +02:00
91557f18cd
Set collision sound type so custom sound types are recognized
2012-06-07 17:59:20 +02:00
d5cc959683
Mantis 6044 Building master currently fails.
...
Add missing reference to System.Core
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-06-07 11:16:18 -04:00
e93308072e
Make the "delay restart" button delay restart for 1 hour rather than aborting
...
it altogether. Allow a maximum of three uses before the restart goes through.
2012-06-07 16:32:07 +02:00
a1e857932a
Make change to fix Windows builds
2012-06-07 10:17:37 -04:00
7550b97e65
Log warning if we try to remove a UDP client that has already been removed.
2012-06-07 04:00:29 +01:00
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
a945105003
Make timed bans / timed passes work as expected. Prevent transmission of media
...
URLs to banned clients.
2012-06-07 00:24:33 +02:00
5876a4d392
Prevent a null ref when getting the velocity of an avatar during login or
...
logout.
2012-06-07 00:24:07 +02:00
b02db11c69
Remove a null ref when an avatar's attachment gets the avatar velocity
...
while the avatar is logging in or out.
Also remove some unlocking calls without matching locking call. Merge
artefact cleanup, again.
2012-06-06 20:38:42 +02:00
a12336390f
Remove useless logging of a bare-names stack trace. It's meaningless
...
to a non-programmer and insufficient for a programmer.
Add commented debug output and data collection to troubleshoot
future locking issues.
2012-06-06 20:37:29 +02:00
67483a6e50
Remove two causes of recursive locking. Merge artefact cleanup.
2012-06-06 20:36:47 +02:00
e09a74493f
Reverse the logic of a conditional. Clears up a merge artefact.
2012-06-06 20:35:37 +02:00
34cb8a2ab3
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-06 20:35:00 +02:00
c0b21d92c2
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-06 14:16:19 +01:00
UbitUmarov