352672eaf2
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 22:13:32 +00:00
cacc028835
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 21:03:08 +00:00
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
d1c80efd41
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-17 19:15:41 +01:00
e9c386f6a6
Force a sim exit when hearbeat isn't restarting successfully
2011-11-17 19:15:11 +01:00
b6d83e9c0f
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!
...
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789
2011-11-16 23:01:59 +00:00
bd01c4a5cb
Call public ForEach instead of using m_entities directly. No semantic changes, just cleanup
2011-11-16 02:33:56 -08:00
baa65d4a15
In AddNewClient, iterator over copy of entities rather than copying under read lock
2011-11-15 17:09:17 -08:00
e21949deaf
Comment out the vebose logging on HGFriendsModule.
...
Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
2011-11-16 00:26:54 +00:00
9488b235d1
Fix the build break
2011-11-16 00:10:55 +00:00
33b1e385ec
Look up a homeURL only when it's not null, in addition to not being string.Empty
2011-11-16 00:01:21 +00:00
92dff85afb
Enable log message to tell us what type of url is being requested from a user's homeurl
2011-11-15 23:38:24 +00:00
31ffd5450b
Make tracked per scene thread names conform to the majorirty format.
...
This is <thread-name> (<region-name>)
2011-11-15 23:34:28 +00:00
aea547cd11
fix build break on UserManagementModule.
...
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
5b9fe4497d
Do proper locking of UserManagementModule.m_UserCache when getting.
...
This might help with
[USER AGENT CONNECTOR]: new connector to ()
[USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs
[USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null.
Parameter name: uriString
2011-11-15 23:12:41 +00:00
29eb3b2eb5
improve formatting of "show threads"
2011-11-15 22:51:12 +00:00
ccae787d03
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-15 22:20:44 +00:00
122304317c
temporarily increasing logging in HGFriendsModule for debugging
2011-11-15 22:14:31 +00:00
e11b9dddb6
distinguish between FriendsSimConnector and FriendsServiceConnector in log
2011-11-15 21:51:45 +00:00
7db38a351c
Add number of milliseconds since last update to "show threads"
2011-11-15 21:49:13 +00:00
94b1c16398
Dont' bother with a userAgentService != null check right after we've constructed it
2011-11-15 20:37:49 +00:00
828e4a5b09
Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
2011-11-15 20:26:42 +00:00
e16d7fe1da
Instead of having scene add/remove collision events directly to the OdeScene collision event dictionary, marshall them via a change dictionary first.
...
This is to avoid a complicated tri-thread deadlock on region crossing for avatars with attachments, where
1) XEngine starting up scripts can lock XEngine.m_Scripts and then try to lock OdeScene._collisionEventPrim while starting up a script due to avatar border crossing
2) An existing collision event will lock OdeScene._collisionEventPrim and then try to lock SP.m_attachments while trying to send the collision event to attachments
3) The avatar still entering the region will lock SP.m_attachments and then try to lock m_Scripts to start more attachment scripts.
2011-11-15 20:02:09 +00:00
45c7789b54
use a more efficient dictionary in OdeScene._collisionEventPrim rather than a list
2011-11-15 19:42:33 +00:00
a3c5f76942
Removed unused and mostly commented out SceneCommunicationService methods
...
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
2011-11-15 18:16:43 +00:00
affec18625
Remove prebuild reference to now gone PumaCode.SvnDotNet.dll
2011-11-15 17:40:13 +00:00
20f26eeb17
Remove unused RegionCommsListener/IRegionCommsListener.
...
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
2011-11-15 17:38:55 +00:00
64784bc0cf
remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead
2011-11-15 17:30:58 +00:00
430821d837
Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFriends() to reflect their intended function
2011-11-15 16:12:35 +00:00
2b5b4ac167
refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better reflect its actual function
2011-11-15 16:05:08 +00:00
50803dfe2c
For clients that are entering a simulator from initial login, stop executing FriendsModule.FetchFriendslist() asychronously.
...
Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated.
Changing this to synchronous may improve issues where a user does not see friends as online even though they are.
I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
2011-11-15 15:57:53 +00:00
8d0aaa359f
refactor: Don't create a new UUID for passing uuids to client - UUIDs are structs are so not passed by reference (and they're immutable!)
2011-11-15 15:05:10 +00:00
89632f3ea8
Add test for removing a friendship.
2011-11-14 20:56:56 +00:00
ed19284d85
Merge branch 'remove-scene-viewer'
2011-11-14 12:37:48 -08:00
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
17f32b7773
Fix build break
2011-11-14 20:33:39 +00:00
e5ff7f389b
Improved method doc for AddFriend() - it actually does set up a two-way relationship.
...
Rename IFriendsModule.AddFriend() to AddFriendship()
2011-11-14 20:31:16 +00:00
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
a64def8b73
minor: remove some mono compiler warnings
2011-11-14 18:16:14 +00:00
348d15707d
Add test for adding a friend whilst online
2011-11-14 18:08:02 +00:00
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
ff36a1bc7b
If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring().
...
This is to progress http://opensimulator.org/mantis/view.php?id=5789
2011-11-14 16:06:06 +00:00
49ec85ae15
Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions
...
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
2011-11-14 15:24:02 +00:00
6daa61d6ba
Merge branch 'master' into bigmerge
2011-11-12 12:36:52 +00:00
efc6c6db7c
Fix taking or returning locked objects losing permissions for owner
2011-11-12 12:09:28 +01:00
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
e61ea79c72
doh - correct build break
2011-11-12 00:27:43 +00:00
f130e1a86f
Add threads to the watchdog thread list before we start them.
...
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
2011-11-12 00:24:45 +00:00
25c32061e4
Make log messages on authentication failure more explicit
2011-11-11 23:45:08 +00:00
a4ec97cfdd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2011-11-11 23:43:18 +00:00
Justin Clark-Casey (justincc)