| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+17 |
| |\ | |||||
| | * | Improve locking when access queue in EventQueueGetModule | Justin Clark-Casey (justincc) | 2011-09-24 | 1 | -14/+17 |
| | | | |||||
| * | | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmerge | Melanie | 2011-10-11 | 1 | -14/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| | * | remove unused SOP.Create() method | Justin Clark-Casey (justincc) | 2011-09-23 | 1 | -14/+0 |
| | | | |||||
| * | | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge | Melanie | 2011-10-11 | 8 | -109/+270 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs | ||||
| | * | Fix avatar parameter updating for viewer 3 and maybe 2. | Justin Clark-Casey (justincc) | 2011-09-23 | 8 | -93/+270 |
| | | | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -5/+5 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-21 | 12 | -90/+28 |
| | | |\ | |||||
| * | | \ | Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge | Melanie | 2011-10-11 | 2 | -9/+18 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix failure to teleport when an agent is lured on the same sim (and probably ↵ | Justin Clark-Casey (justincc) | 2011-09-22 | 2 | -9/+18 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | in neighbouring sims) with HG lure active It turns out that the HG lure module was setting up a pending lure when it intercepted the instant message on its way out to the target avatar. However, an IM would only be sent if the user was remote, so it would not be set up for users on the same sim or in an immediate neighbour. We fix this by adding the pending lure when the message goes out and ignoring a duplicate pending lure add if it goes to out via IM. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5690 | ||||
| * | | | Merge commit '2c0bb8118db0b91c14783c2e2a401725e88aa650' into bigmerge | Melanie | 2011-10-11 | 1 | -5/+5 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Commented out new debug statements in ScenePresence | Dan Lake | 2011-09-21 | 1 | -5/+5 |
| | | | | |||||
| * | | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 12 | -90/+28 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 12 | -90/+28 |
| | |/ | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
| * | | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge | Melanie | 2011-10-11 | 3 | -2/+203 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Move code which handles NPC movement into Scene so that this can also be ↵ | Justin Clark-Casey (justincc) | 2011-09-21 | 3 | -1/+203 |
| | | | | | | | | | | | | | | | | | used by Autopilot coming from the client side. I thought that I had implemented this but must have accidentally removed it. Adds a regression test to detect if this happens again. Temporarily disables automatic landing of NPC at a target. Will be fixed presently. | ||||
| * | | Merge commit 'f9438e7147bbb347a45b14126fa7181307f8ef43' into bigmerge | Melanie | 2011-10-11 | 1 | -8/+0 |
| |\ \ | |/ | |||||
| | * | Remove unused and never set SP.PreviousRotation | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -8/+0 |
| | | | |||||
| | * | get rid of an incredibly noisy logging message from the last commit | Justin Clark-Casey (justincc) | 2011-09-21 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-21 | 2 | -12/+18 |
| | |\ | |||||
| * | \ | Merge commit '8159fd7110459246ff61a41800899f5d854eceee' into bigmerge | Melanie | 2011-10-11 | 3 | -5/+110 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | When calling osNpcMoveTo(), rotate the avatar in the direction of travel. | Justin Clark-Casey (justincc) | 2011-09-21 | 3 | -6/+115 |
| | | | | | | | | | | | | | | | | | | | | | | This stops the npc walking backwards if the target is directly behind. This means that the npc no longer returns to its original rotation once movement has finished. If you want this behaviour, please store and reset the original rotation after movement. This is somewhat to address http://opensimulator.org/mantis/view.php?id=5678 | ||||
| * | | | Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Null simulation data must return a non-null region settings or other parts ↵ | Dan Lake | 2011-09-20 | 1 | -2/+4 |
| | | | | | | | | | | | | | of the simulator expect | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-09-20 | 3 | -66/+0 |
| | |\ \ | | |/ | |||||
| * | | | Merge commit 'fa9291512aabbe72cb6b1b0b7a9af79d9b05d253' into bigmerge | Melanie | 2011-10-11 | 1 | -9/+13 |
| |\ \ \ | |/ / | |||||
| | * | | Make debug statements in ScenePresence consistent and add a few more | Dan Lake | 2011-09-20 | 1 | -10/+14 |
| | | | | |||||
| * | | | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmerge | Melanie | 2011-10-11 | 3 | -66/+0 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Remove vestigal OpenSim.Data mono addins extension points that don't look ↵ | Justin Clark-Casey (justincc) | 2011-09-20 | 3 | -66/+0 |
| | |/ | | | | | | | like they've been active for at least 2 and a half years | ||||
| * | | Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge | Melanie | 2011-10-11 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | adjust some whitespace to trigger another build, to check the last failure ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 1 | -2/+2 |
| | | | | | | | | | was just a glitch | ||||
| * | | Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge | Melanie | 2011-10-11 | 9 | -7026/+0 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs prebuild.xml | ||||
| | * | Remove old bullet DotNET and X libraries in preparation for BulletS | Justin Clark-Casey (justincc) | 2011-09-17 | 9 | -7027/+0 |
| | | | | | | | | | | | These weren't working properly anyway. You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well. | ||||
| * | | Merge commit '385c4a210deb63c25f082ab8a3f0c63c7bff8fb5' into bigmerge | Melanie | 2011-10-11 | 2 | -1/+7 |
| |\ \ | |/ | |||||
| | * | On setting a new avatar appearance, if height hasn't changed then don't set ↵ | Justin Clark-Casey (justincc) | 2011-09-17 | 2 | -1/+7 |
| | | | | | | | | | | | | | that same height in ScenePresence. This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself | ||||
| * | | Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge | Melanie | 2011-10-11 | 2 | -6/+23 |
| |\ \ | |/ | |||||
| | * | Stop the avatar stalling on its first boarder cross when using the ODE plugin | Justin Clark-Casey (justincc) | 2011-09-16 | 2 | -6/+23 |
| | | | | | | | | | | | | | When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor. This in turn reset Velocity, which cause the border stall. I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose | ||||
| * | | Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | minor: I was wrong about OffsetPosition - sometimes it genuinely does return ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -0/+4 |
| | | | | | | | | | | | | | offset position! Add method doc to explain this. | ||||
| * | | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmerge | Melanie | 2011-10-11 | 4 | -7/+24 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Remove setter from SP.OffsetPosition, since all sets should flow through ↵ | Justin Clark-Casey (justincc) | 2011-09-16 | 2 | -5/+23 |
| | | | | | | | | | | | | | SP.AbsolutePosition OffsetPosition is also misnamed - it returns the absolute position and never contains an offset. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-09-16 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | justincc | 2011-09-16 | 1 | -1/+4 |
| | | |\ | |||||
| * | | \ | Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge | Melanie | 2011-10-11 | 1 | -91/+88 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Updated some variables to be closer to the coding standards (and easier to ↵ | Kevin Houlihan | 2011-09-16 | 1 | -91/+88 |
| | | |/ | |/| | | | | | | | | | | | | | | | | understand). There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix. I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used. | ||||
| * | | | Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fix build errors on Windows by adding missing OpenSim.Services.Base reference | justincc | 2011-09-16 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+4 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Passwords could be revealed in console by pressing backspace. | Kevin Houlihan | 2011-09-16 | 1 | -1/+4 |
| | |/ | | | | | | | Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press. | ||||
| * | | Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge | Melanie | 2011-10-11 | 3 | -7/+71 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |