Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Remove physics actor related race conditions in SetVehicleFlags() and ↵ | Justin Clark-Casey (justincc) | 2012-05-09 | 1 | -7/+9 | |
| |/ / | | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-05-08 | 1 | -0/+2 | |
| |\ \ | ||||||
| | * | | Mantis 1456 same region teleport of a sitting avatar. | Talun | 2012-05-09 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports. | |||||
| * | | | Trigger event when scene presences are updated | Dan Lake | 2012-05-08 | 2 | -0/+34 | |
| |/ / | ||||||
| * | | Add automated TestllBreakLink() | Justin Clark-Casey (justincc) | 2012-05-08 | 1 | -0/+27 | |
| | | | ||||||
| * | | Add automated TestllCreateLink() | Justin Clark-Casey (justincc) | 2012-05-08 | 1 | -0/+112 | |
| | | | ||||||
| * | | refactor: Eliminate local id parameter from api initialize. | Justin Clark-Casey (justincc) | 2012-05-08 | 10 | -46/+36 | |
| | | | | | | | | | | | | This is always available from m_host.LocalId | |||||
| * | | Instead of constantly looking up unchanging self item in script code, pass ↵ | Justin Clark-Casey (justincc) | 2012-05-08 | 10 | -190/+145 | |
| | | | | | | | | | | | | in self item on initialization. | |||||
| * | | Perform SceneGraph.DuplicateObject() under existing m_updateLock already ↵ | Justin Clark-Casey (justincc) | 2012-05-08 | 1 | -75/+89 | |
| | | | | | | | | | | | | | | | | | | | | | used for link and delinking, in order to avoid race conditions. DuplicateObject() relies on source object having correct link numbers for the duration of the dupe. Both link and delink can change link numbers such that they are not consistent for short periods of time. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-08 | 3 | -47/+38 | |
|\ \ \ | |/ / | ||||||
| * | | Revert "Better error handling if Load OAR or Save OAR fail" | Justin Clark-Casey (justincc) | 2012-05-07 | 3 | -32/+6 | |
| | | | | | | | | | | | | | | | | | | This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8. Yet again I accidentally committed something whilst evaluating it. | |||||
| * | | Log the full exception when errors occur in BaseHttpServer | Oren Hurvitz | 2012-05-07 | 1 | -19/+19 | |
| | | | ||||||
| * | | Better error handling if Load OAR or Save OAR fail | Oren Hurvitz | 2012-05-07 | 3 | -6/+32 | |
| | | | ||||||
| * | | For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and ↵ | Justin Clark-Casey (justincc) | 2012-05-07 | 1 | -8/+10 | |
| | | | | | | | | | | | | | | | | | | osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo] [GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example | |||||
| * | | refactor: Instead of performing a ScenePresence lookup twice over ↵ | Justin Clark-Casey (justincc) | 2012-05-07 | 1 | -18/+2 | |
| | | | | | | | | | | | | LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject() | |||||
| * | | Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ↵ | Justin Clark-Casey (justincc) | 2012-05-07 | 1 | -2/+7 | |
| | | | | | | | | | | | | not be notified once a non-local friend was found. | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-08 | 3 | -15/+46 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge branch 'ubitwork' into avination | Melanie | 2012-05-07 | 1 | -11/+17 | |
| |\ \ | ||||||
| | * | | minor change to linear motor decay | UbitUmarov | 2012-05-07 | 1 | -11/+17 | |
| | | | | ||||||
| * | | | Fix moving no-mod objects. Fixes a regression introduced with the undo fix | Melanie | 2012-05-07 | 2 | -4/+29 | |
| |/ / | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-07 | 9 | -12/+22 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for ↵ | dahlia | 2012-05-07 | 1 | -4/+8 | |
| | | | | | | | | | | | | OpenMetaverse.Primitive object | |||||
| * | | remove default values from prior commit since mono cant deal with them | dahlia | 2012-05-07 | 5 | -5/+5 | |
| | | | ||||||
| * | | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵ | dahlia | 2012-05-06 | 4 | -4/+9 | |
| | | | | | | | | | | | | moving NPCs | |||||
| * | | Stop llSetPos from sending one update per child prim | Melanie | 2012-05-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | just another test :) | nebadon | 2012-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | never say last test!! | nebadon | 2012-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | one last test.. | nebadon | 2012-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | last test clean up the mess.. | nebadon | 2012-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | test #2 | nebadon | 2012-05-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | testing new opensimulator.org hardware out to make sure git still works! | nebadon | 2012-05-05 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-07 | 3 | -23/+112 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | UbitODE: reduced the diference btw dinamic and static friction, making ↵ | UbitUmarov | 2012-05-05 | 1 | -17/+17 | |
| | | | | | | | | | | | | dinamic larger more identical to static. | |||||
| * | | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵ | UbitUmarov | 2012-05-05 | 1 | -2/+4 | |
| | | | | | | | | | | | | change here also) | |||||
| * | | ubitODE prims: - moved outbounds checking back to ↵ | UbitUmarov | 2012-05-05 | 1 | -4/+91 | |
| | | | | | | | | | | | | UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force) | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-05 | 4 | -20/+136 | |
|\ \ \ | |/ / | ||||||
| * | | force lower avatar density for testing | UbitUmarov | 2012-05-05 | 1 | -0/+4 | |
| | | | ||||||
| * | | UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any ↵ | UbitUmarov | 2012-05-04 | 1 | -2/+4 | |
| | | | | | | | | | | | | significant change like new 'velocity' or new position, etc, requests | |||||
| * | | Fix teleporting from older to newer regions | Melanie | 2012-05-04 | 1 | -1/+8 | |
| | | | ||||||
| * | | Add the default animation to the child agent data update | Melanie | 2012-05-04 | 2 | -0/+14 | |
| | | | ||||||
| * | | Reverse the order of physics event unsubscription to allow GC. Adapted from ↵ | Melanie | 2012-05-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | Unit's reverted patch | |||||
| * | | Retain velocity on walking crossing - adapted from Ubit's reverted patch | Melanie | 2012-05-04 | 1 | -1/+13 | |
| | | | ||||||
| * | | Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵ | Melanie | 2012-05-04 | 2 | -28/+8 | |
| | | | | | | | | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb. | |||||
| * | | *TO TEST/REVIEW* added current default animation in animationSet.cs ↵ | UbitUmarov | 2012-05-04 | 2 | -8/+28 | |
| | | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0); | |||||
| * | | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵ | UbitUmarov | 2012-05-04 | 1 | -12/+54 | |
| | | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail | |||||
| * | | Stabilize sit position on region crossing | Melanie | 2012-05-03 | 1 | -1/+7 | |
| | | | ||||||
| * | | Clear permissions given to the object we stand up from | Melanie | 2012-05-03 | 2 | -2/+31 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 60 | -357/+825 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵ | Justin Clark-Casey (justincc) | 2012-05-05 | 4 | -15/+30 | |
| | | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952 | |||||
| * | | Use the more efficient HashSet instead of List for ↵ | Justin Clark-Casey (justincc) | 2012-05-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | FlotasmAssetCache.m_CurrentlyWriting |