Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Partially apply the core banlines fix | Melanie | 2012-02-23 | 1 | -5/+8 |
| | |||||
* | Fix preserving the animation state of a crossing seated avatar | Melanie | 2012-02-23 | 1 | -2/+10 |
| | |||||
* | Properly sequence updates of avatars and attachments so that we don't | Melanie | 2012-02-23 | 1 | -0/+3 |
| | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| * | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high. | ||||
* | | Adjust sit target and the llSetLinkPrimitiveParams sit position hack | Melanie | 2012-02-22 | 1 | -2/+22 |
| | | | | | | | | to match SL. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 1 | -1/+2 |
| |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 1 | -1/+2 |
| | | | | | | | | | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours. | ||||
* | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 1 | -58/+92 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-02-15 | 1 | -51/+88 |
| |\ \ | | | | | | | | | | | | | careminster | ||||
| | * | | Implement region crossing of sitting avatars. Edit mode and llSetPos work | Melanie | 2012-02-14 | 1 | -51/+88 |
| | | | | | | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 1 | -7/+4 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Make ScenePresence.MovementFlag a private only settable value to reduce ↵ | Justin Clark-Casey (justincc) | 2012-02-11 | 1 | -7/+4 |
| | | | | | | | | | | | | complexity of code analysis | ||||
| | * | Teleport routing, part 1 | Melanie | 2012-01-24 | 1 | -0/+53 |
| | | | |||||
* | | | scenepresence change! in standup() give avatar a physical actor after ↵ | UbitUmarov | 2012-02-11 | 1 | -0/+10 |
|/ / | | | | | | | deciding the new position. This reduces a bit the odds of it being still coliding with object. | ||||
* | | Comment debug spam | Melanie | 2012-01-30 | 1 | -3/+3 |
| | | |||||
* | | Add teleport routing, first part | Melanie | 2012-01-24 | 1 | -0/+59 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Comment out noisy log lines I accidentally included in the nant build target ↵ | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | adjustment commit. Left in the method doc. | ||||
| * | Remove monocov and other obsolete nant build targets. | Justin Clark-Casey (justincc) | 2012-01-16 | 1 | -1/+1 |
| | | | | | | | | | | monocov was a code coverage attempt 3 years ago which no longer works. other removed targets have been commented out or unused for a very long time | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -5/+6 |
|\ \ | |/ | |||||
| * | HG landing points: this hopefully fixes some confusion that was making HG ↵ | Diva Canto | 2012-01-10 | 1 | -5/+6 |
| | | | | | | | | avies always land in 0,0 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-10 | 1 | -17/+29 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Add some run-time debugging support | BlueWall | 2012-01-09 | 1 | -1/+3 |
| | | | | | | | | | | | | Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful. Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value. | ||||
| * | Use our TeleportFlags | BlueWall | 2012-01-09 | 1 | -20/+28 |
| | | | | | | | | Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable. | ||||
| * | TP Routing debug | BlueWall | 2012-01-09 | 1 | -2/+5 |
| | | | | | | | | Fix test to checking against bitfield instead of int | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-09 | 1 | -1/+20 |
|\ \ | |/ | |||||
| * | Fix teleport routing for incoming HG+Owner | BlueWall | 2012-01-09 | 1 | -18/+19 |
| | | | | | | | | Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in. | ||||
| * | Debugging HG teleport routing | BlueWall | 2012-01-09 | 1 | -0/+18 |
| | | | | | | | | Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-09 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix HG teleport routing | BlueWall | 2012-01-09 | 1 | -2/+4 |
| | | | | | | | | Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types. | ||||
| * | Fix a build break | Melanie | 2012-01-09 | 1 | -1/+1 |
| | | |||||
| * | Add the HG case to landing point checks | Melanie | 2012-01-09 | 1 | -1/+1 |
| | | |||||
| * | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -16/+58 |
| | | |||||
| * | Fix teleport routing | BlueWall | 2012-01-08 | 1 | -0/+17 |
| | | | | | | | | Route non-owner avatars according to land settings | ||||
* | | Update teleport routing to match Avination | Melanie | 2012-01-08 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-07 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix bug where tapping home to stop falling would stop any avatar movement ↵ | Justin Clark-Casey (justincc) | 2012-01-07 | 1 | -2/+4 |
| | | | | | | | | | | | | other than falling again. Addresses http://opensimulator.org/mantis/view.php?id=5839 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | commented out "Prevented flyoff" log message for now as this becomes ↵ | Justin Clark-Casey (justincc) | 2012-01-03 | 1 | -1/+1 |
| | | | | | | | | | | | | problematic with bot testing. Please uncomment if still needed. | ||||
* | | Fix camera orientation for sit targets to use the prim actually sat on. | Melanie | 2011-12-24 | 1 | -1/+1 |
| | | | | | | | | Now SL compatible. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | And a typo fix | Melanie | 2011-12-22 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Add a few comments, correct a merge artefact | Melanie | 2011-12-22 | 1 | -1/+6 |
| | | |||||
| * | Harmonizing SP with Avination | Melanie | 2011-12-22 | 1 | -41/+55 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-22 | 1 | -117/+112 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs |