aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Reinstate setter for OffsetPosition to allow setting the offset by scriptMelanie2011-12-051-0/+7
| | | | while seated
* Don't allow position update on sitting avatar. Don't bounds check sittingMelanie2011-12-041-2/+9
| | | | avatars as they will be crossed by the vehicle and not individually
* Remove some debug code that had snuck inMelanie2011-12-011-8/+8
|
* Implement llTransferLindenDollarsMelanie2011-12-011-0/+10
|
* Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-284-83/+19
|\
| * Merge branch 'master' into bigmergeMelanie2011-11-284-83/+19
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| | * minor: formatting changes in Scene.PacketHandlers.csJustin Clark-Casey (justincc)2011-11-261-5/+5
| | |
| | * Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().Justin Clark-Casey (justincc)2011-11-261-58/+0
| | | | | | | | | | | | This has been handled by WebFetchInvDescHandler.Fetch() for some time.
| | * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵Justin Clark-Casey (justincc)2011-11-251-2/+2
| | | | | | | | | | | | conversion rather than the arrays in TaskInventoryItem
| | * Remove bizarre call to PhysicsScene.Simulate(0) in ↵Justin Clark-Casey (justincc)2011-11-241-4/+2
| | | | | | | | | | | | | | | | | | Scene.GetNearestAllowedPosition() At least on ODE, this wasn't doing any harm but there wasn't any point to it either
| | * When setting packet level logging via "debug packet", apply to all clients, ↵Justin Clark-Casey (justincc)2011-11-241-14/+10
| | | | | | | | | | | | | | | | | | not just root ones. Also adds scene name and client type (root|child) to logged information.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-245-58/+30
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-245-58/+30
| |\ \ | | |/
| | * Stop an exception being thrown and a teleport/border cross failing if the ↵Justin Clark-Casey (justincc)2011-11-224-29/+22
| | | | | | | | | | | | | | | | | | | | | 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)
| | * Chain SOP constructors together rather than having copy/paste codeJustin Clark-Casey (justincc)2011-11-211-14/+5
| | |
| | * refactor: Make SOP.Description an automatic propertyJustin Clark-Casey (justincc)2011-11-211-6/+3
| | |
| | * Remove unused PhysicsActor.SOPDescriptionJustin Clark-Casey (justincc)2011-11-211-11/+2
| | |
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-193-20/+22
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-193-20/+22
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| | * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+6
| | | | | | | | | | | | | | | | | | | | | 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
| | * Don't register a region twice on both official registration and maptile ↵Justin Clark-Casey (justincc)2011-11-191-7/+5
| | | | | | | | | | | | | | | | | | regeneration. Maptile storage appears orthogonal to region registration
| | * If the entire simulator is shutting down then don't bother to unload the ↵Justin Clark-Casey (justincc)2011-11-171-10/+16
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-178-136/+56
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-11-178-136/+56
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| | * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵Justin Clark-Casey (justincc)2011-11-163-3/+11
| | | | | | | | | | | | | | | | | | | | | 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 yesterday
| | * Call public ForEach instead of using m_entities directly. No semantic ↵Dan Lake2011-11-161-2/+2
| | | | | | | | | | | | changes, just cleanup
| | * In AddNewClient, iterator over copy of entities rather than copying under ↵Dan Lake2011-11-151-2/+3
| | | | | | | | | | | | read lock
| | * Make tracked per scene thread names conform to the majorirty format.Justin Clark-Casey (justincc)2011-11-151-1/+3
| | | | | | | | | | | | This is <thread-name> (<region-name>)
| | * Add comments about trying to avoid synchronous work off the ↵Justin Clark-Casey (justincc)2011-11-152-4/+12
| | | | | | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
| | * 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 unused RegionCommsListener/IRegionCommsListener.Justin Clark-Casey (justincc)2011-11-151-3/+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-153-10/+6
| | | | | | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead
| | * For clients that are entering a simulator from initial login, stop executing ↵Justin Clark-Casey (justincc)2011-11-151-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add test for removing a friendship.Justin Clark-Casey (justincc)2011-11-141-0/+11
| | |
* | | Force a sim exit when hearbeat isn't restarting successfullyMelanie2011-11-171-0/+4
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-147-414/+24
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Merge branch 'remove-scene-viewer'Dan Lake2011-11-146-409/+22
| |\
| | * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-116-409/+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-141-5/+2
| | | | | | | | | | | | | | | | | | relationship. Rename IFriendsModule.AddFriend() to AddFriendship()
* | | Merge branch 'master' into bigmergeMelanie2011-11-142-0/+16
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * | Add test for adding a friend whilst onlineJustin Clark-Casey (justincc)2011-11-141-0/+14
| | |
| * | Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to ↵Justin Clark-Casey (justincc)2011-11-141-0/+2
| |/ | | | | | | | | | | 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
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-121-1/+9
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-112-248/+370
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * 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.
| * 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.
| * remove unncessary IClientAPI parameter from SP.SendSitResponse()Justin Clark-Casey (justincc)2011-11-111-4/+3
| |