986f6b39ca
Fix build
2011-12-12 20:32:47 +00:00
7a8dd539fd
minor: remove pointless comment from OdeScene.cs
2011-12-12 20:24:03 +00:00
382cda662f
minor: comment out "unpacked appearance" log mesasge for now
2011-12-12 20:23:17 +00:00
ede9aea45f
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-12 20:23:07 +00:00
52b8518fc2
Do some clean up Scene.cs log messages.
...
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
2011-12-12 20:22:57 +00:00
c3d16955a7
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-12 20:22:54 +00:00
61df0da7f9
remove some unused fields in ScenePresence
2011-12-12 20:18:13 +00:00
f8b0427086
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
...
In this situation we will now put out a slightly more meaningful log error message instead.
2011-12-12 20:17:43 +00:00
5b0d0ef1e9
Don't reply with an ack packet if the client is not authorized.
2011-12-12 20:17:22 +00:00
7ca688f5c5
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-12 20:17:14 +00:00
9dc1000c27
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-12 20:15:28 +00:00
638afca5aa
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-12 20:15:16 +00:00
7e415e3f85
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-12 20:11:26 +00:00
8c4e58995d
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-12 20:09:04 +00:00
d26ded4788
fix build
2011-12-12 20:08:49 +00:00
5268334c61
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-12 20:08:02 +00:00
6ba4cbc259
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-12 20:00:15 +00:00
ac445463e9
Remove a left over log output
2011-12-08 23:54:33 +00:00
1e83800d32
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-08 23:54:25 +00:00
3d94984eee
Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false
2011-12-08 23:54:18 +00:00
fd8734b22c
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-08 23:54:11 +00:00
9b229efdc5
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-08 23:54:04 +00:00
81daedcfe3
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-08 23:53:43 +00:00
b819771919
RemoteAdmin - Added optional terrain loading on region create using parameter heightmap_file to specify the terrain file to be loaded
2011-12-08 23:53:18 +00:00
2f536f92c0
Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() check on XMLRPC RemoteAdmin handlers.
...
If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway.
2011-12-08 23:52:04 +00:00
0b4774c50c
replace List used by m_accessIP in RemoteAdminPlugin with the more efficient HashSet
2011-12-08 23:51:58 +00:00
c13916d392
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-12-08 23:51:16 +00:00
3ebb56734d
properly lock CapsHandlers.m_capsHandlers
2011-12-08 23:47:45 +00:00
235147c857
Make "show appearance" a synonym for "appearance show"
2011-12-06 22:24:11 +00:00
ddb74bc68d
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 22:23:52 +00:00
cd132966df
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 22:21:02 +00:00
5d4fee6eb9
conflict resolution due to drift in ValidateBakedTextureCache args
2011-12-06 22:20:44 +00:00
cc80377325
Allow "appearance show" command to take an optional avatar name
2011-12-06 22:20:01 +00:00
7dce33ce69
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 22:16:49 +00:00
0dd45f6ca4
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 22:16:40 +00:00
ac3d88804f
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 22:13:58 +00:00
f1698552f9
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 21:06:16 +00:00
dfeb424afd
Add "appearance send" command to allow manual sending of appearance.
2011-12-05 16:02:26 +00:00
2380980975
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-05 16:00:36 +00:00
52ec854c42
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-05 16:00:27 +00:00
4dbfcc26a2
Provide more user feedback when "debug http" is set
2011-12-05 16:00:15 +00:00
a262d2492f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-12-05 16:00:06 +00:00
e5b7e2fd40
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-12-05 15:59:53 +00:00
7505f23f80
Improve some of the debug help messages
2011-12-05 15:59:45 +00:00
7562e63ae6
minor: remove mono compile warning, a Vector3 can never be null since it's a struct
2011-12-05 15:59:38 +00:00
7987a6da95
tabulate "show caps" output for easier readability
2011-12-05 15:59:27 +00:00
fcd60c6b74
Correct mistake in "debug eq" help
2011-12-05 15:59:19 +00:00
1e88bf78f1
When setting packet level logging via "debug packet", apply to all clients, not just root ones.
...
Also adds scene name and client type (root|child) to logged information.
2011-12-05 15:58:24 +00:00
a819890137
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-12-05 15:55:32 +00:00
5c85a98f6a
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-12-05 15:54:10 +00:00
e58daf052d
minor: remove mono compiler warning
2011-12-05 15:50:20 +00:00
0a0e285919
remove some mono compiler warnings
2011-11-28 15:59:43 +00:00
c693bd51a0
Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition()
...
At least on ODE, this wasn't doing any harm but there wasn't any point to it either
2011-11-28 15:59:30 +00:00
808ace0696
minor: remove mono compiler warning
2011-11-28 15:59:20 +00:00
9730a862db
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-28 15:58:06 +00:00
754d6036ea
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-28 15:54:57 +00:00
476d893630
Comment out uncalled OdeScene.UnCombine()
2011-11-28 15:54:49 +00:00
0a6374d37a
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-28 15:54:40 +00:00
0337f2e2a0
minor: remove mono compiler warning
2011-11-28 15:54:32 +00:00
7be35d5a9a
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-28 15:54:25 +00:00
8ab2d42143
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-28 15:54:13 +00:00
dc8ce9ec5d
Improve the error messages returned if the HelloNeighbour call fails.
...
This is the message a region sends to its neighbours when it comes up
2011-11-28 15:54:04 +00:00
7171913400
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-28 15:53:53 +00:00
0cf5c0837b
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-28 15:53:45 +00:00
1edfe05c16
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-28 15:53:36 +00:00
bba4577d88
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-28 15:53:28 +00:00
5c305494ae
simplify operation of OdeScene._perloopContact
2011-11-28 15:53:19 +00:00
4b2b0d4a05
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-28 15:53:11 +00:00
61848ebe0d
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-28 15:53:04 +00:00
f48431345b
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-28 15:52:53 +00:00
9c4597a00f
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-28 15:49:37 +00:00
b528150d16
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-28 15:42:36 +00:00
4a99619bc0
Reduce complexity of OdeScene.Simulate() by fully removing bad characters at point of detection rather than later on.
2011-11-28 15:42:21 +00:00
5bd27b7b22
move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBodyCreation().
...
This saves us having to do it separately when a character capsule size is changed
2011-11-28 15:38:50 +00:00
8ea97cc608
When changing avatar size in ODE, remove the old actor from the name and actor maps
2011-11-28 15:38:42 +00:00
1850b778e2
When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove the actor reference in OdeScene.actor_name_map rather than leaving it dangling.
...
This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter()
2011-11-28 15:37:57 +00:00
5cd33f5e21
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-28 15:37:49 +00:00
cd3d5379d6
Actually remove PhysicsActor.SOPDescription this time
2011-11-28 15:37:04 +00:00
58021b5300
Chain SOP constructors together rather than having copy/paste code
2011-11-28 15:36:53 +00:00
3b141e5eee
refactor: Make SOP.Description an automatic property
2011-11-28 15:34:29 +00:00
08bc6622dd
Remove unused PhysicsActor.SOPDescription
2011-11-28 15:30:00 +00:00
c253539c04
Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.
2011-11-28 15:29:51 +00:00
59c19110e4
Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent" message
...
This is misleading since a simulator will call this method before successfully trying remote regions.
Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
2011-11-28 15:28:35 +00:00
7c03fba3fc
minor: Make HelloNeighbour messages more informative
2011-11-28 15:28:28 +00:00
2593a446ac
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
...
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-28 15:28:14 +00:00
25133cbdf6
Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
2011-11-28 15:27:53 +00:00
06ed824711
Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)
2011-11-28 15:27:43 +00:00
63aa448608
improve region deregistration log message
2011-11-28 15:27:36 +00:00
e31d7fe424
minor: remove some mono compiler warnings
2011-11-17 23:55:45 +00:00
fef3baf107
For TerrainModule.SaveToFile(), don't bother throwing the exception onwards after printing out the error, since this method is invoked by users.
...
Still throwing the exception on the stream method since this invoked programatically
2011-11-17 23:24:58 +00:00
123322569d
Make "terrain save" more friendly by telling the user if we have saved and putting out a useful complaint message if we haven't for some reason
2011-11-17 23:24:50 +00:00
8c0d8e72aa
If the entire simulator is shutting down then don't bother to unload the scripts from the appdomain in XEngine.
...
All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
2011-11-17 23:24:43 +00:00
1e69845869
Make tracked per scene thread names conform to the majorirty format.
...
This is <thread-name> (<region-name>)
2011-11-17 23:24:23 +00:00
1bc0d0fac6
improve formatting of "show threads"
2011-11-17 23:24:05 +00:00
f7b5d17aa2
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-17 23:23:57 +00:00
85170f5d5d
distinguish between FriendsSimConnector and FriendsServiceConnector in log
2011-11-17 23:23:48 +00:00
66863fdd34
Add number of milliseconds since last update to "show threads"
2011-11-17 23:23:42 +00:00
6b0553ed7c
Dont' bother with a userAgentService != null check right after we've constructed it
2011-11-17 23:23:35 +00:00
78739067d1
Remove unused RegionCommsListener/IRegionCommsListener.
...
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
2011-11-17 23:22:57 +00:00
310c2403b0
remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead
2011-11-17 23:22:48 +00:00
Justin Clark-Casey (justincc)