aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-230-0/+0
|\
| * Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-233-13/+129
| |
* | Merge branch 'master' into careminsterMelanie2013-01-230-0/+0
|\ \ | |/
| * Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-233-33/+114
| | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server.
* | Merge branch 'avination' into careminsterMelanie2013-01-2310-83/+181
|\ \
| * | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) andMelanie2013-01-233-31/+29
| | | | | | | | | | | | | | | make the function async so the script thread is not held up waiting for comms to an external server.
| * | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| | | | | | | | | | | | | | | to prevent avatars being locked into their sim on a failed teleport. May have side effects and must be revisited to fix right.
| * | Guard against XMLRPC module ref being null, which will happen if it's disabledMelanie2013-01-231-3/+7
| | |
| * | * A better way to handle the last fix (This is in case the viewer provides a ↵teravus2013-01-211-10/+16
| | | | | | | | | | | | list of preferred formats, though, technically, the sim would pick the first provided format the old way). This just makes it more obvious what's happening.
| * | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-218-309/+83
| |\ \
| | * | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | | |
| | * | Limit active at targets to 8Melanie2013-01-211-2/+6
| | | |
| | * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | | |
| | * | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
| | | |
| | * | Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-202-14/+46
| | | |
| | * | Revert "Refactor scripted http request to use async calls rather than hard ↵Melanie2013-01-201-87/+53
| | | | | | | | | | | | | | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b.
| | * | Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| | | |
| | * | Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFastMelanie2013-01-191-2/+0
| | | |
| * | | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵teravus2013-01-211-1/+10
| | | | | | | | | | | | | | | | on missing textures. It was just waiting and no event was being provided. This re-enables the 404 response.
| * | | * Fix notecard loading - If the notecard name is formatted like a UUID but ↵teravus2013-01-211-11/+35
| | | | | | | | | | | | | | | | isn't an actual asset UUID, then try to load it like an asset id first, then try to load it as a task inventoryitem name. If the passed UUID is a string, try to load it like a task inventory item name.
* | | | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-2360-12599/+1566
| |\ \ \
| * | | | Add additional return statusBlueWall2013-01-232-4/+23
| | | | | | | | | | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-2314-487/+259
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | careminster
| * \ \ \ \ 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-2350-12555/+1330
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | | | | | BulletSim: Tweeks to vehicle motion.Robert Adams2013-01-213-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass through old angular velocity making for smoother transitions. Remove some old kludges for angular motion (damping and rotvel suppression).
| * | | | | | BulletSim: allow changing position and rotation of a child of a linksetRobert Adams2013-01-218-46/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without rebuilding the whole compound shape. Should make vehicles move smoother.
| * | | | | | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-212-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
| * | | | | | BulletSim: remove unused MaxTaintsToProcessPerStep parameterRobert Adams2013-01-213-8/+5
| | | | | | |