Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into varregion | Robert Adams | 2014-01-04 | 2 | -8623/+10023 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Constants.cs OpenSim/Framework/RegionInfo.cs OpenSim/Services/GridService/GridService.cs OpenSim/Services/Interfaces/IGridService.cs Most conflicts had to do with Util routines not in master branch yet. | ||||
| * | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8623/+10023 |
| |\ | |||||
| | * | Add lsl arg syntax checking for control event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -9386/+9716 |
| | | | |||||
| | * | refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for ↵ | Justin Clark-Casey (justincc) | 2013-12-21 | 1 | -7907/+7903 |
| | | | | | | | | | | | | consistency | ||||
| | * | Add arg checking for at_target lsl event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8828/+9158 |
| | | | |||||
| | * | Add lsl event arg checking for at_rot_target | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8915/+9306 |
| | | | |||||
| | * | Add lsl event argument checking for attach and on_rez | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8593/+8946 |
| | | | |||||
* | | | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-03 | 5 | -34/+76 |
| | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). | ||||
* | | | varregion: extract banned region logic into a class for cleanlyness. | Robert Adams | 2013-12-27 | 2 | -148/+187 |
| | | | | | | | | | | | | | | | Add 'not found' caching in EntityTransferModule.GetRegionContainingWorldLocation so hitting borders and bad teleports do not continuiously hammer on the GridService. | ||||
* | | | varregion: many more updates removing the constant RegionSize and replacing | Robert Adams | 2013-12-26 | 25 | -179/+149 |
| | | | | | | | | | | | | with a passed region size. This time in the map code and grid services code. | ||||
* | | | varregion: add lots of DEBUG level log messages. Especially for teleport. | Robert Adams | 2013-12-24 | 6 | -10/+16 |
| | | | |||||
* | | | varregion: remove unused Scene.HaveNeighbor routine. Its computation | Robert Adams | 2013-12-24 | 1 | -42/+1 |
| | | | | | | | | | | | | was wrong for large regions anyway. | ||||
* | | | varregion: fix bug where destination region is not found and object is | Robert Adams | 2013-12-24 | 1 | -47/+61 |
| | | | | | | | | | | | | not restored to its original location. | ||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2013-12-20 | 2 | -6/+65 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-19 | 2 | -6/+65 |
| |\ \ | | |/ | |||||
| | * | Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵ | Justin Clark-Casey (justincc) | 2013-12-18 | 2 | -6/+65 |
| | | | | | | | | | | | | sending | ||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2013-12-17 | 27 | -1082/+2019 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Fix issue with editing notes for other avatars | BlueWall | 2013-12-16 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-12-16 | 9 | -67/+80 |
| |\ \ | |||||
| | * \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Extend TestLlGetNotecardLine() regression test to contain chars that are two ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | bytes in utf8 | ||||
| | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 3 | -21/+22 |
| | |\ \ | | | |/ | |||||
| | | * | Wrap analysis of the particle system in the UUID Gatherer in a separate ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion. | ||||
| | | * | After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented | ||||
| | | * | Convert if-blocks to return statements in small functions such as ↵ | Eva Comaroski | 2013-12-14 | 1 | -15/+5 |
| | | | | | | | | | | | | | | | | GetStartParameter(). | ||||
| | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -16/+22 |
| | |\ \ | | | |/ | |||||
| | | * | Make WindParamSet success a console message rather than a log message. | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890 | ||||
| | | * | minor: Make wind console commands print out to console rather than log | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -14/+21 |
| | | | | |||||
| | * | | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 2 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor | ||||
| | * | | Fix build break in test from previous commit 54cc229 - hadn't realized ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | ScenePresence inst var name was slightly different | ||||
| | * | | Fix TestSitAndStandWithNoSitTarget NPC and SP tests. | Justin Clark-Casey (justincc) | 2013-12-14 | 3 | -15/+4 |
| | | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests | ||||
| | * | | Eliminate unnecessary line from my previous commit 1d605642 | Justin Clark-Casey (justincc) | 2013-12-13 | 1 | -2/+0 |
| | | | | |||||
| | * | | Refix sitting on child prims by reinserting relevant code back into ↵ | Justin Clark-Casey (justincc) | 2013-12-11 | 1 | -3/+22 |
| | | | | | | | | | | | | | | | | SP.HandleAgentSit() | ||||
| * | | | This is the acutal sitting avatar crossing code. This commit implements the | Melanie | 2013-12-16 | 1 | -2/+152 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | actual crossing mechanics for seated avatars, using the supporting code from the previous commits. Physics is not supported yet, although some few bits for them are already in place due to the earlier code drops. With this commit, crossing sitting avatar by "editing" the prim across the border, by using llSetPos or keyframe motion may already be possible. Vehicles will come next. | ||||
| * | | Replace proprietary file header with BSD one | Melanie | 2013-12-11 | 1 | -6/+27 |
| | | | |||||
| * | | Add missing files *blush* | Melanie | 2013-12-11 | 1 | -0/+19 |
| | | | |||||
| * | | Committing the Avination Scene Presence and related texture code | Melanie | 2013-12-11 | 13 | -494/+1355 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements | ||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-12-11 | 1 | -2/+88 |
| |\ \ | | |/ | |||||
| | * | Add console utility commands "scale scene" and "translate scene". Note that ↵ | dahlia | 2013-12-10 | 1 | -2/+88 |
| | | | | | | | | | | | | repeated use of these commands will induce floating point accumulation errors. Please back up your region before using. | ||||
| * | | This is the Avination Entity Transfer Module. Surprisingly, it still compiles | Melanie | 2013-12-11 | 2 | -239/+214 |
| |/ | | | | | | | | | but I don't know if it runs. Will probably crash and burn as the supporting code isn't there yet. | ||||
| * | apparently mono DeflateStream has no CopyTo method =( | dahlia | 2013-12-06 | 1 | -1/+5 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2013-12-06 | 5 | -11/+108 |
| |\ | |||||
| | * | Add support for user preferences (im via email) | BlueWall | 2013-12-06 | 2 | -0/+69 |
| | | | |||||
| * | | use System.IO.Compression.DeflateStream for mesh decompression in an attempt ↵ | dahlia | 2013-12-06 | 1 | -9/+5 |
| | | | | | | | | | | | | to reduce mesh asset decoding failures | ||||
* | | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. | Robert Adams | 2013-12-14 | 22 | -95/+95 |
| | | | | | | | | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module. | ||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2013-12-05 | 3 | -11/+39 |
|\ \ \ | | |/ | |/| | |||||
| * | | minor: Use enums for setting inv/asset types on data upload rather than ↵ | Justin Clark-Casey (justincc) | 2013-12-06 | 1 | -7/+7 |
| | | | | | | | | | | | | magic numbers | ||||
| * | | Properly set InventoryType.Snapshot when a snapshot is uploaded | Justin Clark-Casey (justincc) | 2013-12-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=6857 This prevents the inventory service complaining later about an attempt to change an invariant | ||||
| * | | Fix regression where mouse look flight direction no longer worked by zeroing ↵ | Justin Clark-Casey (justincc) | 2013-12-05 | 2 | -14/+26 |
| | | | | | | | | | | | | | | | | | | | | | x/y rot before sending agent updates, instead of before any agent update processing It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook. Doing this in the terse send so that we preserve mouselook rotation information | ||||
| * | | Ignore X and Y body rotations when sent by mouse look. | Justin Clark-Casey (justincc) | 2013-12-03 | 1 | -3/+15 |
| |/ | | | | | | | | | | | | | | | Fixes http://opensimulator.org/mantis/view.php?id=3274 When not in mouselook, avatar only sends rotations around the Z plane (since that's the only way an avatar can rotate). However, in mouselook it also sends X and Y information. But sending X and Y in terse updates causes issues with wrong camera movement in mouselook. So strip out X and Y components for now. If this is an issue, then could strip out before sending avatar terse update, though this generates more cpu work. Thanks to mirceakitsune for suggesting an initial fix |