aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* JustinCC's core re-mergeMelanie2013-01-161-3/+23
|
* Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-161-0/+4
|\
| * move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵dahlia2013-01-141-0/+4
| | | | | | | | other than the object currently sat on
* | Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminsterMelanie2013-01-161-3/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Fix exception reporting in SceneObjectPart so it logs what the exception is ↵Robert Adams2013-01-111-2/+2
| | | | | | | | rather than just saying it happened.
| * Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-0/+3
| | | | | | | | | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* | Merge branch 'avination' into careminsterMelanie2013-01-133-31/+39
|\ \
| * | go back bypassing sog updates control (test)UbitUmarov2013-01-111-12/+12
| | |
| * | update the last information sent in terse updates where they are sent to allUbitUmarov2013-01-111-10/+19
| | | | | | | | | | | | clients and not only on Scheduled sends
| * | remove redundant lastPhysGroupPos and lastPhysGroupRot checksUbitUmarov2013-01-111-16/+3
| | | | | | | | | | | | in SOG Update(). rootpart does more complet checks
| * | same for AngularVelocity. Use normal terse updates in place of sendingUbitUmarov2013-01-111-10/+18
| | | | | | | | | | | | imediatly. If that's good for physics, needs to be good for this
| * | keyframe. Don't use group UpdateRotation since this enqueues a terseUbitUmarov2013-01-111-2/+6
| | | | | | | | | | | | update and we are sending them imediatly
* | | Merge branch 'master' into careminsterMelanie2013-01-111-103/+80
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-94/+59
| | | | | | | | | | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
| * | refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | | | | | | | | | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
| * | Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-9/+30
| | | | | | | | | | | | | | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
| * | Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | | | | | | | | | This reverts commit 5561333668f61f043cdfc0733a4eb50a1bcfb14e.
| * | Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | | | | | | | | | This reverts commit a775931a0cec9f65748c6e20dd2695edcbe21b7f.
| * | Fix sequence id fr default animMelanie2013-01-081-1/+1
| | |
| * | Prevent empty Anim PacksMelanie2013-01-081-0/+12
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-103-59/+72
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Change IsRoot to use ReferenceEquals to prevent operator == messinessMelanie2013-01-091-1/+1
| | |/ | |/|
| * | Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | | | | | | | | | This reverts commit ab053df706055b0aa8fe2d10f89488be97d36841.
| * | Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | | | | | | | | | This reverts commit 8f37f2ca7edd408f30165fef9817375a9813ce90.
| * | Fix sequence id fr default animMelanie2013-01-081-1/+1
| | |
| * | Prevent empty Anim PacksMelanie2013-01-081-0/+12
| | |
| * | Remove now superfluous update of m_lastSizeMelanie2013-01-081-3/+0
| | |
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2013-01-081-0/+2
| |\ \
| | * | also update m_lastSize in SendAvatarDataToAllAgents so more paths updateUbitUmarov2013-01-081-0/+2
| | | | | | | | | | | | | | | | it
| | * | Revert "Remove sending AvatarData because this also happens on login, where ↵Melanie2013-01-081-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | it chokes" This reverts commit d1fa650c3f16ee74cd39d9258c5ef7aa4869ca03.
| | * | Merge branch 'ubitwork' into avinationMelanie2013-01-081-45/+61
| | |\ \
| | * | | Remove sending AvatarData because this also happens on login, where it chokesMelanie2013-01-081-9/+1
| | | | | | | | | | | | | | | | | | | | Firestorm, Singularity and other viewers with the new appearance pipeline.
| * | | | Prevent avatar data from being sent during login when it's not valid andMelanie2013-01-082-2/+6
| | |/ / | |/| | | | | | | | | | crashes login on some viewers.
| * | | put back position and rot change check before sending releasing plane constrainUbitUmarov2013-01-081-4/+7
| | | |
| * | | reduce sampling of camera raycasts to previus valueUbitUmarov2013-01-081-23/+26
| | | |
| * | | * DAnger, TEST * change camera plane collision detection. Still bounces onUbitUmarov2013-01-081-49/+59
| |/ / | | | | | | | | | * prim edges due to camera lag
| * | in raycast for camera exclude self detectionUbitUmarov2013-01-071-3/+2
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-061-51/+111
|\ \ \ | |/ /
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+17
| | |
| * | make ResetMoveToTarget cancel any 'force' waiting to be applied to avatarUbitUmarov2013-01-031-7/+2
| | | | | | | | | | | | ( by the odd use of Velocity)
| * | cancel MoveToTarget (viewer 'go here") on sitsUbitUmarov2013-01-031-2/+22
| | |
| * | *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-021-2/+4
| | |
| * | Merge branch 'ubitwork' into avinationMelanie2012-12-221-47/+46
| |\ \
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| | |\ \
| | * \ \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-4/+6
| | |\ \ \
| | * | | | some clean up/fixUbitUmarov2012-12-171-47/+46
| | | | | |
| * | | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-211-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | Cached Bakes.
| * | | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| | |_|/ / | |/| | | | | | | | | | | | | synchronize with Agni.
* | | | | Merge branch 'master' into careminsterMelanie2013-01-044-81/+74
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-042-46/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477
generated by cgit v1.1 at 2024-10-23 23:25:59 +0000