96b3eed1b0
Merge branch 'careminster' into bigmerge
2011-12-09 11:23:34 +00:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
63fe673af1
Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.""
...
This turned out not to be the upload texture issue.
This reverts commit 8721841fc3
2011-12-08 23:45:53 +00:00
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
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
2011-12-08 19:25:24 +00:00
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
54360dd20e
When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop.
...
This is already being done for the initial object data send.
2011-12-08 18:39:56 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know 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
2011-12-08 18:34:23 +00:00
3b991a2222
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-08 18:30:09 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
355cde464a
Simplify Scene.AddNewClient()
...
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.
2011-12-08 16:10:47 +00:00
8d7c353500
Merge branch 'master' into bigmerge
2011-12-08 05:47:45 +00:00
43732794dd
Remove a left over log output
2011-12-08 05:46:59 +00:00
3217bccfcd
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 05:29:13 +01:00
1e4842eaba
Remove superfluous try block
2011-12-08 05:28:54 +01:00
7c7dd6269a
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 03:37:48 +01:00
ea1f5fb08d
Merge branch 'master' into bigmerge
2011-12-08 03:53:30 +00:00
603ad905e1
Adapt to justincc's remote admin refactor
2011-12-08 03:53:09 +00:00
ac82fc60f9
Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmerge
2011-12-08 03:30:23 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
b459239833
Recover from an internal mess-up in the outgoing packet queues by creating
...
a new queue object.
2011-12-08 01:08:40 +01:00
dae58e0937
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-07 22:42:05 +00:00
2b4de8f881
Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false
2011-12-07 22:40:23 +00:00
fb2f4f158c
Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block of code to do password checks, etc., instead of copy/pasting this code into every method
2011-12-07 22:39:12 +00:00
eda770e978
Remove unused SceneManager.TryGetAvatarsScene()
...
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
2011-12-07 21:17:13 +00:00
3d95015686
On an Exception in Scene.RemoveClient(), always remove the client (and SP) structure so that logout on unexpired packets isn't retriggered, causing the same exception
2011-12-07 18:43:48 +00:00
2b02d3dc84
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 17:33:06 +00:00
415b7b7ec4
Implement XMLRPCAdmin command admin_teleport_agent.
...
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
33c6067098
Trigger a Jenkins build
2011-12-07 11:21:50 -05:00
0fcd55aff3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 10:39:25 -05:00
fd023b317a
Update libomv to 0.9.1
2011-12-07 09:56:15 -05:00
a8ed185c00
properly lock CapsHandlers.m_capsHandlers
2011-12-07 14:55:01 +00:00
6ec59ee892
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-07 07:52:24 -05:00
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
ccba04f345
Fix intersim object give messages
2011-12-07 01:27:52 +01:00
f317953290
Fix up intersim give messaging
2011-12-07 01:02:46 +01:00
d6486fe14a
Fix task inventory giving
2011-12-07 00:43:59 +01:00
62d0a0cdbf
Remove harmless merge artefact
2011-12-06 22:58:00 +01:00
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same 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)
2011-12-06 21:42:56 +00:00
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
8721841fc3
Revert "Stop performing the asset save part of baked texture uploading on 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 1854c52ea3
2011-12-06 18:37:13 +00:00
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
Melanie