aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-0411-88/+251
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * minor: Disable logging left active on regression test ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | TestSameSimulatorIsolatedRegionsV2()
| * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-274-12/+12
| | | | | | | | the code that this is symmetric with CloseAgent()
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-274-29/+17
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * minor: Add scene name to baked textures in cache log messageJustin Clark-Casey (justincc)2013-09-261-1/+1
| |
| * Reinsert client.SceneAgent checks into ↵Justin Clark-Casey (justincc)2013-09-251-0/+3
| | | | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100) This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message. This is most probably why the message appeared to get lost on a proportion of entity transfers. A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-222-0/+21
| | | | | | | | | | | | | | | | | | | | Patch taken from http://opensimulator.org/mantis/view.php?id=4905 originally by Greg C. Fixed to apply to r/23314 commit ba9daf849e7c8db48e7c03e7cdedb77776b2052f (cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
| * Lock around read/write of ScenePresence.m_originRegionID to make sure that ↵Justin Clark-Casey (justincc)2013-09-201-5/+33
| | | | | | | | | | | | all threads are seeing the latest value and not a cached one. There is a possibilty that some V2 teleport failures are due to the viewer triggered CompleteMovement thread not seeing the change of m_originRegionID by the UpdateAgent thread.
| * Change some message log levels in Scene.IncomingUpdateChildAgent() for ↵Justin Clark-Casey (justincc)2013-09-201-3/+3
| | | | | | | | debugging purposes
| * UUID Gatherer: find assets used in Light Projection, Particle Systems, and ↵Oren Hurvitz2013-09-191-1/+14
| | | | | | | | Collision Sounds.
| * For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 ↵Justin Clark-Casey (justincc)2013-09-191-1/+1
| | | | | | | | | | | | | | | | teleport protocol even if SIMULATION/0.2 is available. This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details. Default remains "SIMULATION/0.2" Primarily for http://opensimulator.org/mantis/view.php?id=6755
| * minor: Make SP.MakeRootAgent() private - no external code has any business ↵Justin Clark-Casey (justincc)2013-09-191-1/+1
| | | | | | | | calling this method
| * minor: Make log message at top of ScenePresence.CompleteMovement info level ↵Justin Clark-Casey (justincc)2013-09-191-5/+5
| | | | | | | | | | | | | | and comment out later log message in ScenePresence.MakeRootAgent() Need an info message since this is currently important in detecting teleport issue when not at debug log level. CompleteMovement message occurs before MakeRootAgent() one did
| * Revert "Also check user authorization if looking to upgrade from a child to ↵Justin Clark-Casey (justincc)2013-09-191-13/+0
| | | | | | | | | | | | | | a root agent." This reverts commit c7ded0618c303f8c24a91c83c2129292beebe466. This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
| * Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that ↵Justin Clark-Casey (justincc)2013-09-192-1/+88
| | | | | | | | avatars are not allowed to cross into a neighbour where they are not authorized, even if a child agent was allowed.
| * minor: correct method name in commentJustin Clark-Casey (justincc)2013-09-181-1/+1
| |
| * refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-182-6/+7
| | | | | | | | verb-noun is consistent with other similar methods
| * minor: Make log message when Scene.IncomingChildAgentDateUpdate() more ↵Justin Clark-Casey (justincc)2013-09-182-4/+12
| | | | | | | | | | | | | | explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root Add some comments about the mssage sequence, though much more data is at http://opensimulator.org/wiki/Teleports
| * Reinsert comments about possible race conditions when sending bulk inventory ↵Justin Clark-Casey (justincc)2013-09-161-0/+3
| | | | | | | | updates on non-flag clothing editing
| * BulletSim: remove chatty debug message from previous commit.Robert Adams2013-09-111-3/+3
| |
| * BulletSim: add position and rotation update for child prim physics update ↵Robert Adams2013-09-111-0/+20
| | | | | | | | events. Normally, physics engines do not return updates for child prims so, under normal operation, this code should never execute. Will only be used when using flexible linkset linkages.
| * Change collision logic in SceneObjectPart so land_collision will happen.Robert Adams2013-09-091-6/+3
| | | | | | | | | | The previous logic would generate land_collision_start and land_collision_end but would not generate the land_collision itself.
* | 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
generated by cgit v1.1 at 2024-09-12 18:20:17 +0000