aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination-current' into careminsterMelanie2013-09-167-26/+27
|\ | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-082-4/+6
| |
| * Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-083-8/+8
| |
| * Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| | | | | | | | was being called twice on each crossing.
| * * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-08-241-2/+22
| | | | | | | | location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
| * Revert "* This increases accuracy when border crossing (the reason is.. ↵teravus2013-08-241-7/+7
| | | | | | | | | | | | the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop." This reverts commit 55400ff7be55b1c8dbededca68e6fce42cd6ce0f.
| * * This increases accuracy when border crossing (the reason is.. the border ↵teravus2013-08-231-7/+7
| | | | | | | | crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
| * Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |
| * * This fixes having to select and deselect prim to get keyframemotion to ↵Melanie2013-06-131-0/+5
| | | | | | | | | | | | | | | | start running when pulled from data storage. Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.cs
* | Merge branch 'master' into careminsterMelanie2013-09-072-12/+85
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-051-5/+1
| | |
| * | Also check user authorization if looking to upgrade from a child to a root ↵Justin Clark-Casey (justincc)2013-09-041-0/+13
| | | | | | | | | | | | | | | | | | agent. Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
| * | For a Hypergrid user, delay estate access checks until NewUserConnection() ↵Justin Clark-Casey (justincc)2013-09-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that they work. This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID. However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule. Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent() The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection() However, to preserve the accuracy of query access we will only relax the check for HG users.
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-022-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
| * | Comment out warning about agent updating without valid session ID for now.Justin Clark-Casey (justincc)2013-09-021-4/+4
| | | | | | | | | | | | This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
* | | Merge branch 'master' into careminsterMelanie2013-09-014-37/+33
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Potential fix for access control bug on login introduced with SeeIntoRegion ↵Diva Canto2013-08-241-1/+1
| | | | | | | | | | | | commit.
| * | Remove old and unused ScenePresence.RestoreInCurrentScene()Justin Clark-Casey (justincc)2013-08-231-5/+0
| | |
| * | Refactor: merge SceneGraph.AddScenePresence() into ↵Justin Clark-Casey (justincc)2013-08-231-28/+6
| | | | | | | | | | | | | | | | | | CreateAndAddChildScenePresence() since the former was only ever called from the latter This allows us to remove dead code relating to adding root agents directly to the scenegraph, which never happens.
| * | Stop error messages being misleadingly generated when on client connection ↵Justin Clark-Casey (justincc)2013-08-221-2/+19
| | | | | | | | | | | | | | | | | | activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity. Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
| * | Don't allow users to attempt to sit on objects in a child region without ↵Justin Clark-Casey (justincc)2013-08-211-0/+9
| | | | | | | | | | | | | | | | | | | | | going to that region first. If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid. Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
| * | * Fix some threading issues in BulletXNA (the managed bullet library), this ↵teravus2013-08-201-2/+3
| | | | | | | | | | | | | | | | | | should better allow you to run it in multiple region scenarios (but why would you really want to do that?) Source in OpenSimLibs. * Fixed a null ref during shutdown.
* | | Merge branch 'master' into careminsterMelanie2013-08-181-4/+16
|\ \ \ | |/ /
| * | Allow updating the wearable type of wearables that have a type of 0.Melanie2013-08-181-4/+16
| | | | | | | | | | | | This will allow viewers to fix broken wearables as they detect them.
* | | Merge branch 'master' into careminsterMelanie2013-08-175-21/+176
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * | minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
| | |
| * | Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() ↵Justin Clark-Casey (justincc)2013-08-173-5/+67
| | | | | | | | | | | | | | | | | | regression test for v2 transfers. Also adjusts names of teleport setup helpers in EntityTransferHelpers
| * | Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity ↵Justin Clark-Casey (justincc)2013-08-161-2/+87
| | | | | | | | | | | | transfer protocl
| * | Rely on the Scene.IncomingCloseAgent() check as to whether the connection ↵Justin Clark-Casey (justincc)2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | should be kept open after teleport-end rather than doing this in the ET Module This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
| * | Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-151-11/+20
| | | | | | | | | | | | | | | | | | | | | This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity. In this case, the DoNotCloseAfterTeleport was wrongly set. The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur Hence, this code now closes child agents as the first action after a sucessful teleport.
* | | Merge branch 'master' into careminsterMelanie2013-08-142-0/+25
|\ \ \ | |/ /
| * | Add method doc to Scene.RemoveClient() to ask any callers to use ↵Justin Clark-Casey (justincc)2013-08-142-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Scene.IncomingCloseAgent() instead. IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close. Hence, it's also necessary for everyone to consistently call IncomingCloseAgent() Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
* | | Merge branch 'master' into careminsterMelanie2013-08-113-137/+368
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.Justin Clark-Casey (justincc)2013-08-091-1/+1
| | | | | | | | | | | | | | | | | | This is giving much better results on teleports between simulators over my lan where for some reason there is a pause before the receiving simulator processes UpdateAgent() At this point, v2 teleports between neighbour and non-neighbour regions on a single simulator and between v2 simulators and between a v1 and v2 simulator are working okay for me in different scenarios (e.g. simple teleport, teleport back to original quickly and re-teleport, teleport back to neighbour and re-teleport. etc.)
| * | Add missing file from b1c26a56Justin Clark-Casey (justincc)2013-08-091-0/+102
| | |
| * | Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-092-115/+235
| |\ \
| | * | Fix an issue with an A->C->B->A teleport where these regions are in a row ↵Justin Clark-Casey (justincc)2013-08-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (A,B,C) where the A root agent is still closed, terminating the connection. This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport). Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
| | * | Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-082-116/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-092-22/+35
| |\ \ \
| | * | | Make m_originRegionID in ScenePresence public to allow DSG module to work ↵Dan Lake2013-08-081-2/+2
| | |/ / | | | | | | | | | | | | for now. Once the code churn on teleport ends, I can find a better solution
| * | | Go easy on enforcing session ids in position updatesDiva Canto2013-08-091-16/+17
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-08-073-38/+63
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | minor: add some method doc to ScenePresence fields used for entity transfer, ↵Justin Clark-Casey (justincc)2013-08-072-20/+33
| |/ / | | | | | | | | | | | | | | | add minor details to some log messages, rename a misleading local variable name. No functional changes.
| * | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around ↵Diva Canto2013-08-071-16/+16
| | | | | | | | | | | | estate bans also, and delete the obsolete config var.
| * | Child agent updates: remove the dependency on the root agent's camera ↵Diva Canto2013-08-051-2/+1
| | | | | | | | | | | | position. That was a complete overkill that is unnecessary at this point.
| * | More on HG inventory and OutboundPermission: disallowing giving inventory to ↵Diva Canto2013-08-031-0/+3
| | | | | | | | | | | | foreigners if OutboundPermission is false
| * | HG: If OutboundPermission is set to false, let's enforce stricter ↵Diva Canto2013-08-031-0/+3
| | | | | | | | | | | | permissions by not allowing objects to be taken to inventory.
| * | Turn off edit beams when object is derezed while being edited. (mantis #6722)Diva Canto2013-08-011-0/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2013-08-011-0/+48
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * | Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+48
| | | | | | | | | | | | | | | | | | | | | cap is something other than "localhost". A new interface for handling external caps is supported with an example implemented for Simian. The only linden cap supporting this interface right now is the GetTexture cap.
generated by cgit v1.1 at 2024-12-30 07:27:24 +0000