aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-0614-452/+1070
|\
| * bug fix, cleanup...UbitUmarov2013-01-033-38/+34
| |
| * check land permitions on sit target for unscripted sitsUbitUmarov2013-01-032-0/+30
| |
| * 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
| |
| * i try to fix avatar orientation in some cases..UbitUmarov2013-01-021-2/+2
| |
| * add a lock to CollisionEventsThisFrameUbitUmarov2013-01-021-20/+29
| |
| * *TEST* avatar unscripted sit. Some guessing/automationUbitUmarov2013-01-026-332/+805
| |
| * Merge branch 'ubitwork' into avinationMelanie2012-12-225-60/+77
| |\
| | * Merge branch 'avination' into ubitworkUbitUmarov2012-12-181-3/+3
| | |\
| | * \ Merge branch 'avination' into ubitworkUbitUmarov2012-12-183-6/+8
| | |\ \
| | * | | missing fileUbitUmarov2012-12-181-4/+3
| | | | |
| | * | | fixUbitUmarov2012-12-183-8/+27
| | | | |
| | * | | some clean up/fixUbitUmarov2012-12-172-48/+47
| | | | |
| * | | | * Partial Commit for Avatar Appearance to include the functionality of ↵teravus2012-12-217-30/+71
| | | | | | | | | | | | | | | | | | | | Cached Bakes.
| * | | | * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to ↵teravus2012-12-191-0/+20
| | | | | | | | | | | | | | | | | | | | synchronize with Agni.
| * | | | Merge branch 'avination' of careminster:/var/git/careminster into teravusworkteravus2012-12-1921-659/+1173
| |\ \ \ \
| * | | | | * This is a better way to do the last commit.teravus2012-12-081-30/+33
| | | | | |
| * | | | | * Should promote faster self appearance.teravus2012-12-071-19/+33
| | | | | |
* | | | | | Merge branch 'master' into careminsterMelanie2013-01-0610-96/+372
|\ \ \ \ \ \
| * | | | | | BulletSim: fix problem where mesh shapes were physically just their bounding ↵Robert Adams2013-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | box and not the complete mesh. Fill mesh physical objects are back.
| * | | | | | BulletSim: implement llMoveToTarget by adding PIDActive, etc.Robert Adams2013-01-042-50/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation of non-vehicle hover but haven't tested it a lot. Update TODO list.
| * | | | | | BulletSim: add some features to the PID motor to make it more flexible.Robert Adams2013-01-041-9/+18
| | | | | | |
| * | | | | | BulletSim: convert avatar movement from a force to an impulse. Shouldn'tRobert Adams2013-01-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change functionality but removes an oddity in computing the force.
| * | | | | | BulletSim: add initial implementation of llMoveToTarget and hover height.Robert Adams2013-01-041-10/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all there yet.
| * | | | | | BulletSim: reorganize motor code a little to pull together common functions.Robert Adams2013-01-041-18/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add BSFMotor.
| * | | | | | BulletSim: add comments to force and impulse setting functionsRobert Adams2013-01-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | so it is clear what Bullet is actually doing with the set values.
| * | | | | | BulletSim: fix problem where pre-step actions would not replacedRobert Adams2013-01-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | by new registrations thus causing multiple instances of an action.
| * | | | | | BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnosticRobert Adams2013-01-044-50/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions. If values set from console, the functions are called. Looking for why the collision pools fill up with unnecessary stuff.
* | | | | | | Merge branch 'master' into careminsterMelanie2013-01-0421-260/+562
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | | | Set default particle burst count to 1 instead of 0 in any set particle ↵Justin Clark-Casey (justincc)2013-01-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system script call that does not have an empty list. As per http://opensimulator.org/mantis/view.php?id=6353
| * | | | | | Fix build break caused by missing ) from dce2809.Justin Clark-Casey (justincc)2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Was hand-typing in a line of code I had tested before but not retested this time
| * | | | | | Automatically grant sit-related llRequestPermissions() for subsequent ↵Justin Clark-Casey (justincc)2013-01-041-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog. Resolves http://opensimulator.org/mantis/view.php?id=6478
| * | | | | | refactor: simplify llGetNumberOfPrims() to return prim count + sitting ↵Justin Clark-Casey (justincc)2013-01-041-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | avatar count rather than independently inspecting every scene presence
| * | | | | | Fix llGetLinkName() to return the name of the last avatar sat as the last ↵Justin Clark-Casey (justincc)2013-01-041-41/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | link number. As per http://wiki.secondlife.com/wiki/LlGetLinkName
| * | | | | | Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-043-63/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ↵Justin Clark-Casey (justincc)2013-01-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | we're deselecting the prim in code before scheduling an update on attachment
| * | | | | | Fix problem where object attached from ground often does not get attached ↵Justin Clark-Casey (justincc)2013-01-031-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly. It seems this is happening because we send a kill for objects that are selected when attached. A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill. Aims to address http://opensimulator.org/mantis/view.php?id=6456
| * | | | | | Scipt modules get the OpenMetaverse types, so lists passed as arguments to ↵SignpostMarv2013-01-031-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | script module functions which then later call LSL_Types.list.GetVector3Item() or LSL_Types.list.GetQuaternionItem() methods would then trigger an InvalidCastException, which is now avoided.
| * | | | | | Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs ↵SignpostMarv2013-01-031-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | based on doxygen error output
| * | | | | | updating documentation in SampleMoneyModule based on doxygen error log ↵SignpostMarv2013-01-031-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter
| * | | | | | minor: Change channel digger replacement message in TerrainModule to Info ↵Justin Clark-Casey (justincc)2013-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from Warn. This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
| * | | | | | Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-025-61/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
| * | | | | | Fixed: the AvatarEnteringNewParcel event wasn't triggered in some casesOren Hurvitz2013-01-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
| * | | | | | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | console command
| * | | | | | minor: minor code and log formatting fixes to recent changes in ↵Justin Clark-Casey (justincc)2013-01-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | LandManagementModule
| * | | | | | Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-023-39/+61
| | | | | | |
| * | | | | | If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-024-26/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | that the operation failed
| * | | | | | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable ↵Justin Clark-Casey (justincc)2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than having to ToString() them first
| * | | | | | Implemented Return Objects when it's invoked from the Top Colliders or Top ↵Oren Hurvitz2013-01-021-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Scripts dialogs