aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-091-34/+27
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since ↵Justin Clark-Casey (justincc)2012-03-091-2/+2
| | | | | | | | this is handled by the necessary ParentPart check
| * Use SP.ParentPart instead of ParentID in places where it's more efficient ↵Justin Clark-Casey (justincc)2012-03-091-13/+13
| | | | | | | | | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
| * refactor: cleanup SP.HandleAgentSit so that everything is done within one if ↵Justin Clark-Casey (justincc)2012-03-091-15/+8
| | | | | | | | (part != null), rather than having unnecessary multiple checks
| * Remove a race condition from SP.Set_AbsolutePosition where we assume the ↵Justin Clark-Casey (justincc)2012-03-091-5/+5
| | | | | | | | | | | | ParentPart is still not null if the ParentID != 0 Another thread could come in and stand the avatar between those two instructions.
| * Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+29
| | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-081-27/+30
|\ \ | | | | | | | | | careminster
| * | Hold a ref to the prim we're sat on rather than querying scene each timeMelanie2012-03-081-27/+30
| | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition.
| * | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-2/+1
| | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login
| * | Try not to send the avatar updates on login. This may mean loggin in withMelanie2012-02-241-1/+2
| | | | | | | | | | | | invisible attachments again but could help the appearance issues.
* | | Merge branch 'master' into careminsterMelanie2012-03-031-89/+25
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * ScenePresence line endings and fix AllowMovement default to true.Dan Lake2012-03-021-30/+30
| |
| * In ScenePresence, removed several private variables used to store public ↵Dan Lake2012-03-011-108/+44
| | | | | | | | parameters. They were only used by the get/set and make code harder to refactor.
| * Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-231-5/+8
| | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
* | Partially apply the core banlines fixMelanie2012-02-231-5/+8
| |
* | Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
| |
* | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-231-0/+3
| | | | | | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
* | Merge branch 'master' into careminsterMelanie2012-02-231-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+1
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-221-2/+22
| | | | | | | | to match SL.
* | Merge branch 'master' into careminsterMelanie2012-02-201-1/+1
|\ \ | |/
| * Amend to last commit. This should have been committed too.Diva Canto2012-02-191-1/+1
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-1/+2
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-1/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-191-1/+2
| | | | | | | | | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-151-58/+92
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-151-51/+88
| |\ \ | | | | | | | | | | | | careminster
| | * | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-51/+88
| | | | | | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet.
| * | | Merge branch 'master' into careminsterMelanie2012-02-151-7/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * Make ScenePresence.MovementFlag a private only settable value to reduce ↵Justin Clark-Casey (justincc)2012-02-111-7/+4
| | | | | | | | | | | | complexity of code analysis
| | * Teleport routing, part 1Melanie2012-01-241-0/+53
| | |
* | | scenepresence change! in standup() give avatar a physical actor after ↵UbitUmarov2012-02-111-0/+10
|/ / | | | | | | deciding the new position. This reduces a bit the odds of it being still coliding with object.
* | Comment debug spamMelanie2012-01-301-3/+3
| |
* | Add teleport routing, first partMelanie2012-01-241-0/+59
| |
* | Merge branch 'master' into careminsterMelanie2012-01-161-1/+1
|\ \ | |/
| * Comment out noisy log lines I accidentally included in the nant build target ↵Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | | | adjustment commit. Left in the method doc.
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-1/+1
| | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time
* | Merge branch 'master' into careminsterMelanie2012-01-101-5/+6
|\ \ | |/
| * HG landing points: this hopefully fixes some confusion that was making HG ↵Diva Canto2012-01-101-5/+6
| | | | | | | | avies always land in 0,0
* | Merge branch 'master' into careminsterMelanie2012-01-101-17/+29
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add some run-time debugging supportBlueWall2012-01-091-1/+3
| | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
| * Use our TeleportFlagsBlueWall2012-01-091-20/+28
| | | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
| * TP Routing debugBlueWall2012-01-091-2/+5
| | | | | | | | Fix test to checking against bitfield instead of int
* | Merge branch 'master' into careminsterMelanie2012-01-091-1/+20
|\ \ | |/
| * Fix teleport routing for incoming HG+OwnerBlueWall2012-01-091-18/+19
| | | | | | | | Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
| * Debugging HG teleport routingBlueWall2012-01-091-0/+18
| | | | | | | | Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
* | Merge branch 'master' into careminsterMelanie2012-01-091-2/+4
|\ \ | |/
| * Fix HG teleport routingBlueWall2012-01-091-2/+4
| | | | | | | | Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
| * Fix a build breakMelanie2012-01-091-1/+1
| |
| * Add the HG case to landing point checksMelanie2012-01-091-1/+1
| |
generated by cgit v1.1 at 2024-10-26 13:24:49 +0000