aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * Add comments about trying to avoid synchronous work off the ↵Justin Clark-Casey (justincc)2011-11-153-5/+16
| | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
| * Instead of having scene add/remove collision events directly to the OdeScene ↵Justin Clark-Casey (justincc)2011-11-151-20/+38
| | | | | | | | | | | | | | | | | | 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.
| * use a more efficient dictionary in OdeScene._collisionEventPrim rather than ↵Justin Clark-Casey (justincc)2011-11-151-7/+4
| | | | | | | | a list
| * Removed unused and mostly commented out SceneCommunicationService methodsJustin Clark-Casey (justincc)2011-11-152-116/+3
| | | | | | | | 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
| * Remove prebuild reference to now gone PumaCode.SvnDotNet.dllJustin Clark-Casey (justincc)2011-11-151-1/+0
| |
| * Remove unused RegionCommsListener/IRegionCommsListener.Justin Clark-Casey (justincc)2011-11-153-275/+0
| | | | | | | | All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
| * remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵Justin Clark-Casey (justincc)2011-11-154-11/+6
| | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead
| * Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> ↵Justin Clark-Casey (justincc)2011-11-152-15/+13
| | | | | | | | RecacheFriends() to reflect their intended function
| * refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to ↵Justin Clark-Casey (justincc)2011-11-151-5/+5
| | | | | | | | better reflect its actual function
| * For clients that are entering a simulator from initial login, stop executing ↵Justin Clark-Casey (justincc)2011-11-153-11/+34
| | | | | | | | | | | | | | | | 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.
| * refactor: Don't create a new UUID for passing uuids to client - UUIDs are ↵Justin Clark-Casey (justincc)2011-11-151-4/+6
| | | | | | | | structs are so not passed by reference (and they're immutable!)
| * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-144-17/+51
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-1410-436/+29
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-147-427/+22
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-117-427/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Improved method doc for AddFriend() - it actually does set up a two-way ↵Justin Clark-Casey (justincc)2011-11-143-9/+7
| | | | | | | | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship()
* | | Fix build breakMelanie2011-11-141-2/+1
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-1412-23/+159
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2011-11-144-11/+2
| | |
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-144-7/+53
| | |
| * | Add very simple FriendsModuleTests.TestNoFriends()Justin Clark-Casey (justincc)2011-11-144-3/+91
| | |
| * | If a friends identifier which is too short is given to ↵Justin Clark-Casey (justincc)2011-11-142-1/+10
| | | | | | | | | | | | | | | | | | 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
| * | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to ↵Justin Clark-Casey (justincc)2011-11-142-1/+4
| |/ | | | | | | | | | | 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
* | Merge branch 'master' into bigmergeMelanie2011-11-121-2/+3
|\ \ | |/
| * doh - correct build breakJustin Clark-Casey (justincc)2011-11-121-6/+7
| |
| * Add threads to the watchdog thread list before we start them.Justin Clark-Casey (justincc)2011-11-121-5/+5
| | | | | | | | Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-122-2/+10
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-116-278/+399
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * Make log messages on authentication failure more explicitJustin Clark-Casey (justincc)2011-11-111-13/+26
| |
| * extract common ScenePresence setup code into Init() method for ↵Justin Clark-Casey (justincc)2011-11-111-39/+31
| | | | | | | | ScenePresenceSitTests
| * add SP.PhysicsActor checks to other sit/stand testsJustin Clark-Casey (justincc)2011-11-111-0/+4
| |
| * add sit and stand on ground testJustin Clark-Casey (justincc)2011-11-111-0/+23
| |
| * extract ground sit code into SP.HandleAgentSitOnGround() for consistency ↵Justin Clark-Casey (justincc)2011-11-111-12/+19
| | | | | | | | with other sitting code.
| * Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.Justin Clark-Casey (justincc)2011-11-111-1/+1
| | | | | | | | Addresses http://opensimulator.org/mantis/view.php?id=5786
| * As with prim sitting avatars, make an avatar phantom when it sits on the ↵Justin Clark-Casey (justincc)2011-11-111-6/+5
| | | | | | | | | | | | | | ground and solid again when it stands. This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move A better solution may be to keep gound sitting avatars solid but remove their collision status. However, this requires some physics code work.
| * Restore sending of OutPacket() for object kills removed in commit c7dd7b1.Justin Clark-Casey (justincc)2011-11-111-26/+20
| | | | | | | | | | | | | | | | | | | | OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible 1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket() 2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record 3) The same thread places the kill packet on the Task queue. 4) The earlier thread resumes and places the update packet on the Task queue after the kill packet. This results in a ghost part in the sim that only goes away after client relog. This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
| * remove unncessary IClientAPI parameter from SP.SendSitResponse()Justin Clark-Casey (justincc)2011-11-111-4/+3
| |
| * As per mailing list last week, remove facility that would automatically move ↵Justin Clark-Casey (justincc)2011-11-112-228/+198
| | | | | | | | | | | | | | the avatar if prim with no sit target was out of sitting range. Now, no movement occurs. Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before.
| * Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing ↵Justin Clark-Casey (justincc)2011-11-112-17/+42
| | | | | | | | | | | | | | list last week. This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking. Existing autopilot outside this range will be disabled in a later commit
| * update minimum mono versionJustin Clark-Casey (justincc)2011-11-111-3/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-11-116-274/+285
| |\
| * | Add new ScenePresenceSitTests with a single sit/stand testJustin Clark-Casey (justincc)2011-11-111-0/+103
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-111-0/+2
|\ \ \ | | |/ | |/|
| * | one more jenkins test!nebadon2011-11-101-0/+1
| | |
| * | one more test of jenkins!nebadon2011-11-101-1/+0
| | |
| * | one more round with leeeeeeeeeeroy jaaaaaaenkins!nebadon2011-11-101-0/+1
| | |
| * | take two on jenkins testing!nebadon2011-11-101-1/+1
| | |
| * | test push to see if sir jenkins responds!nebadon2011-11-101-0/+1
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-110-0/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Fix compile error from an earlier commitDan Lake2011-11-101-2/+0
| | |