aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination'Melanie2013-01-1914-487/+259
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| * Remove group IM test code also mentioning "OpenSimulator Testing"Melanie2013-01-191-26/+1
| |
| * Remove the core groups moduleMelanie2013-01-191-252/+0
| |
| * Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| |
| * Merge branch 'ubitwork' into avinationMelanie2013-01-163-7/+11
| |\
| | * dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
| | |
| | * same for SetPrimParamsUbitUmarov2013-01-161-3/+4
| | |
| | * llSetPos on child prim, send only a part terse update and not a group oneUbitUmarov2013-01-161-3/+4
| | |
| * | * Enables loading cached bakes on teleport by filling in the appropriate ↵teravus2013-01-161-2/+71
| | | | | | | | | | | | | | | | | | avatar fields from the bake data. No more auto rebaking on teleport assuming your wearables, bakes and cache are consistent. * Speeds up appearance sending.. since there's nothing to wait for.
| * | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-1611-216/+167
| |\ \
| | * | Add a way to put things at the front of the queue for any throttle group.Melanie2013-01-165-19/+63
| | |/ | | | | | | | | | | | | | | | | | | Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added a flag value to the Throttle Type (again) because although it's hacky, it's the best of a bad bunch to get the message through the UDP stack to where it's needed.
| | * Merge branch 'ubitwork' into avinationMelanie2013-01-160-0/+0
| | |\
| | | * Revert " fix STATE udp queue data rate since it is in use again, after being"Melanie2013-01-161-4/+1
| | | | | | | | | | | | | | | | This reverts commit 4d92c6b39f3ebb7a27517493b66d097d9d9d23dd.
| | | * fix STATE udp queue data rate since it is in use again, after beingUbitUmarov2013-01-161-1/+4
| | | | | | | | | | | | | | | | removed by intel folks (?)( should it be used or removed ??)
| | * | Merge branch 'ubitwork' into avinationMelanie2013-01-163-172/+61
| | |\ \ | | | |/
| | | * Merge branch 'avination' into ubitworkUbitUmarov2013-01-163-8/+22
| | | |\
| | | * | try to patch getmesh Throttle (test)UbitUmarov2013-01-131-2/+8
| | | | |
| | | * | prevent potencial invalid refsUbitUmarov2013-01-132-170/+53
| | | | |
| | * | | Change all uses of the removed state queue to the task queue for now.Melanie2013-01-161-5/+5
| | | | |
| | * | | Complete removal of the now unused state queueMelanie2013-01-163-18/+3
| | | | |
| * | | | * Document the additional Visual Params of newer browsers in ↵teravus2013-01-141-1/+52
| | | | | | | | | | | | | | | | | | | | AvatarAppearance.VPElement so it can be easily looked up in code/module
* | | | | Merge branch 'master' into careminsterMelanie2013-01-1914-55/+226
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
| * | | | | Explicitly stop PollServiceRequestManager() rather than relying on its ↵Justin Clark-Casey (justincc)2013-01-192-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destructor. Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
| * | | | | New constants for llGetObjectDetailsTalun2013-01-192-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New constants for llGetObjectDetails OBJECT_CHARACTER_TIME, OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE, OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ also Pathfining constants, 3 of which are used by llGetObjectDetails
| * | | | | Mantis 6507 keys returned by llGetAgentList incorrect for llList2KeyTalun2013-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The type of the keys returned by llGetAgentList corrected to LSL_Key
| * | | | | Fix use of scene debug commands when region is set to root or a specific ↵Justin Clark-Casey (justincc)2013-01-191-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | region where there is more than one region on the simulator.
| * | | | | Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-184-24/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
| * | | | | Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-185-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach.
| * | | | | BulletSim: reduce jitter in avatar velocity when walking or flying.Robert Adams2013-01-182-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimulator is VERY sensitive to changes in avatar velocity and will send an avatar update message when velocity changes more than 0.001m/s. This significantly reduces the number of avatar update messages by smoothing the avatar velocity returned by Bullet.
| * | | | | BulletSim: add logic to turn off pre-step actions when object goesRobert Adams2013-01-181-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-active. This turns off 'setForce', 'setTorque' and 'moveToTarget' when the object is selected or made non-physical.
* | | | | | Merge branch 'master' into careminsterMelanie2013-01-186-24/+43
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-174-21/+6
| |\ \ \ \ \
| * | | | | | BulletSim: Add one function that all actors who act on the physicalRobert Adams2013-01-175-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can use to know if the object is currently active. Code cleaning including use of Util.ClampV function.
| * | | | | | Add utility function to clamp a vector to a maximum magnitude.Robert Adams2013-01-171-0/+12
| | | | | | |
* | | | | | | Merge branch 'master' into careminsterMelanie2013-01-1611-63/+243
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
| * | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-1636-161/+839
| |\ \ \ \ \ \
| | * | | | | | Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
| | |/ / / / /
| | * | | | | BulletSim: add the editting children in linkset going phantom bug to TODO list.Robert Adams2013-01-151-0/+2
| | | | | | |
| | * | | | | BulletSim: don't modify angular parameters when doing LIMIT_MOTOR_UP.Robert Adams2013-01-155-28/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was a dumb idea to try and do a nose over feature for jumping cars anyway. Add better logging of native shape creation/reuse so can tell the difference.
| | * | | | | BulletSim: add debugging messages to know when assets for physicalRobert Adams2013-01-154-17/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | objects have been fetched. Update TODO list with more work.
| | * | | | | BulletSim: reduce maximum force a script can apply (like in llApplyImpulse)Robert Adams2013-01-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to the documented maximum from the outragious number previously.
| | * | | | | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-1619-55/+331
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
| | * | | | | Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-168-293/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
| * | | | | | Complete removal of the now unused state queueMelanie2013-01-163-19/+4
| | | | | | |
* | | | | | | Merge branch 'avination' into careminsterMelanie2013-01-163-6/+39
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Add admin_refresh_search command to RemoteAdminMelanie2013-01-161-0/+29
| | |_|_|_|/ | |/| | | |
| * | | | | Add Refresh() Method to ISerachModule to allow forcing a sim to resend it'sMelanie2013-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | search data
| * | | | | Fix llSetRegionPos and detail behaviors of llSet[Link]PrimitiveParams[Fast]()Melanie2013-01-151-5/+9
| | |_|/ / | |/| | | | | | | | | | | | | regarding prim positioning.
* | | | | JustinCC's core re-mergeMelanie2013-01-1619-92/+236
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-01-160-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |