Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 0 | -0/+0 |
|\ | |||||
| * | Add the Avination physics raycast glue so Core Physics can implement raycast | Melanie | 2013-01-23 | 3 | -13/+129 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Remove the return value from llGiveMoney and add llTransferLindenDollars. Also | Melanie | 2013-01-23 | 3 | -33/+114 |
| | | | | | | | | | | make llGiveMoney async so the script thread is not held up waiting for comms to an external server. | ||||
* | | Merge branch 'avination' into careminster | Melanie | 2013-01-23 | 10 | -83/+181 |
|\ \ | |||||
| * | | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) and | Melanie | 2013-01-23 | 3 | -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 transit | Melanie | 2013-01-23 | 1 | -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 disabled | Melanie | 2013-01-23 | 1 | -3/+7 |
| | | | |||||
| * | | * A better way to handle the last fix (This is in case the viewer provides a ↵ | teravus | 2013-01-21 | 1 | -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 teravuswork | teravus | 2013-01-21 | 8 | -309/+83 |
| |\ \ | |||||
| | * | | Add accessors to allow serializing rot and position targets | Melanie | 2013-01-21 | 1 | -2/+12 |
| | | | | |||||
| | * | | Limit active at targets to 8 | Melanie | 2013-01-21 | 1 | -2/+6 |
| | | | | |||||
| | * | | Prevent scene from holding references to SOGs with attargets beyond SOG deletion | Melanie | 2013-01-21 | 1 | -6/+12 |
| | | | | |||||
| | * | | Allow TeleportCancel packets to reset the transfer state machine | Melanie | 2013-01-21 | 1 | -0/+6 |
| | | | | |||||
| | * | | Implement HTTP Request froma thread pool to avoid packet congestion | Melanie | 2013-01-20 | 2 | -14/+46 |
| | | | | |||||
| | * | | Revert "Refactor scripted http request to use async calls rather than hard ↵ | Melanie | 2013-01-20 | 1 | -87/+53 |
| | | | | | | | | | | | | | | | | | | | | | | | | threads" This reverts commit 461ecd7cf9edebce45ab715901a7f3b02c216e7b. | ||||
| | * | | Refactor scripted http request to use async calls rather than hard threads | Melanie | 2013-01-20 | 1 | -53/+87 |
| | | | | |||||
| | * | | Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFast | Melanie | 2013-01-19 | 1 | -2/+0 |
| | | | | |||||
| * | | | * The fallthrough of FetchTexture was no longer resulting in a 404 response ↵ | teravus | 2013-01-21 | 1 | -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 ↵ | teravus | 2013-01-21 | 1 | -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 careminster | Melanie | 2013-01-23 | 2 | -4/+23 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2013-01-23 | 60 | -12599/+1566 |
| |\ \ \ | |||||
| * | | | | Add additional return status | BlueWall | 2013-01-23 | 2 | -4/+23 |
| | | | | | | | | | | | | | | | | | | | | Adding additional return status for JsonRpcMethod. Now returns true/false | ||||
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2013-01-23 | 14 | -487/+259 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | careminster | ||||
| * \ \ \ \ | Merge branch 'avination' | Melanie | 2013-01-19 | 14 | -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" | Melanie | 2013-01-19 | 1 | -26/+1 |
| | | | | | | |||||
| | * | | | | Remove the core groups module | Melanie | 2013-01-19 | 1 | -252/+0 |
| | | | | | | |||||
| | * | | | | Kill the dumb Opensimulator Testing group again - for good. | Melanie | 2013-01-19 | 1 | -8/+3 |
| | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2013-01-16 | 3 | -7/+11 |
| | |\ \ \ | |||||
| | | * | | | dont send a full grp update on stopmovetotarget. just a rootpart terse | UbitUmarov | 2013-01-16 | 2 | -1/+3 |
| | | | | | | |||||
| | | * | | | same for SetPrimParams | UbitUmarov | 2013-01-16 | 1 | -3/+4 |
| | | | | | | |||||
| | | * | | | llSetPos on child prim, send only a part terse update and not a group one | UbitUmarov | 2013-01-16 | 1 | -3/+4 |
| | | | | | | |||||
| | * | | | | * Enables loading cached bakes on teleport by filling in the appropriate ↵ | teravus | 2013-01-16 | 1 | -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 teravuswork | teravus | 2013-01-16 | 11 | -216/+167 |
| | |\ \ \ \ | |||||
| | | * | | | | Add a way to put things at the front of the queue for any throttle group. | Melanie | 2013-01-16 | 5 | -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 avination | Melanie | 2013-01-16 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| | | | * | | | Revert " fix STATE udp queue data rate since it is in use again, after being" | Melanie | 2013-01-16 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4d92c6b39f3ebb7a27517493b66d097d9d9d23dd. | ||||
| | | | * | | | fix STATE udp queue data rate since it is in use again, after being | UbitUmarov | 2013-01-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed by intel folks (?)( should it be used or removed ??) | ||||
| | | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2013-01-16 | 3 | -172/+61 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2013-01-16 | 3 | -8/+22 |
| | | | |\ \ \ | |||||
| | | | * | | | | try to patch getmesh Throttle (test) | UbitUmarov | 2013-01-13 | 1 | -2/+8 |
| | | | | | | | | |||||
| | | | * | | | | prevent potencial invalid refs | UbitUmarov | 2013-01-13 | 2 | -170/+53 |
| | | | | | | | | |||||
| | | * | | | | | Change all uses of the removed state queue to the task queue for now. | Melanie | 2013-01-16 | 1 | -5/+5 |
| | | | | | | | | |||||
| | | * | | | | | Complete removal of the now unused state queue | Melanie | 2013-01-16 | 3 | -18/+3 |
| | | | | | | | | |||||
| | * | | | | | | * Document the additional Visual Params of newer browsers in ↵ | teravus | 2013-01-14 | 1 | -1/+52 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarAppearance.VPElement so it can be easily looked up in code/module | ||||
* | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 50 | -12555/+1330 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs | ||||
| * | | | | | | BulletSim: Tweeks to vehicle motion. | Robert Adams | 2013-01-21 | 3 | -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 linkset | Robert Adams | 2013-01-21 | 8 | -46/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without rebuilding the whole compound shape. Should make vehicles move smoother. | ||||
| * | | | | | | Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter | Robert Adams | 2013-01-21 | 2 | -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 parameter | Robert Adams | 2013-01-21 | 3 | -8/+5 |
| | | | | | | |