| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -0/+16 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | For llGetMass(), return the mass of the avatar is the object is attached. | Justin Clark-Casey (justincc) | 2012-04-06 | 1 | -0/+16 |
| | | | | | | | | | | | As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass This is the mass as used by the physics engine (ODE or Bullet). | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 1 | -16/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵ | Diva Canto | 2012-03-28 | 1 | -16/+0 |
| | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -0/+18 |
| |\ \ | |/ | |||||
| | * | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 1 | -0/+18 |
| | | | |||||
| * | | Make anims way more snappy. Decouple SP animation handling from physics frame | Melanie | 2012-03-23 | 1 | -14/+29 |
| | | | | | | | | | time. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Incorporate scene teleporting debugging into "debug scene teleport ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+1 |
| | | | | | | | | | true|false" command | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | slight increase in jump power to make running jump slightly better. | nebadon | 2012-03-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | reduce avatar verticle jump from the absurd 5 meter jump to a less | nebadon | 2012-03-20 | 1 | -1/+1 |
| | | | | | | | | | | | absurd 3m vertical jump to better match what you would see in Second Life and be more in line with what users would expect. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-09 | 1 | -34/+27 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since ↵ | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -2/+2 |
| | | | | | | | | | this is handled by the necessary ParentPart check | ||||
| | * | Use SP.ParentPart instead of ParentID in places where it's more efficient ↵ | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | (saving extra null checks, etc.) However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null. Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race. | ||||
| | * | refactor: cleanup SP.HandleAgentSit so that everything is done within one if ↵ | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -15/+8 |
| | | | | | | | | | (part != null), rather than having unnecessary multiple checks | ||||
| | * | Remove a race condition from SP.Set_AbsolutePosition where we assume the ↵ | Justin Clark-Casey (justincc) | 2012-03-09 | 1 | -5/+5 |
| | | | | | | | | | | | | | ParentPart is still not null if the ParentID != 0 Another thread could come in and stand the avatar between those two instructions. | ||||
| | * | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+29 |
| | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition. | ||||
| * | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-08 | 1 | -27/+30 |
| |\ \ | | | | | | | | | | careminster | ||||
| | * | | Hold a ref to the prim we're sat on rather than querying scene each time | Melanie | 2012-03-08 | 1 | -27/+30 |
| | | | | | | | | | | | | | the check for significant is carried out. Prevents a deadlock condition. | ||||
| | * | | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | VFS in the viewer are ready. We're much faster than SL and that exposes this race condition. Also reinstate the extra avatar data send on login | ||||
| | * | | Try not to send the avatar updates on login. This may mean loggin in with | Melanie | 2012-02-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | invisible attachments again but could help the appearance issues. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 1 | -89/+25 |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | ScenePresence line endings and fix AllowMovement default to true. | Dan Lake | 2012-03-02 | 1 | -30/+30 |
| | | | |||||
| | * | In ScenePresence, removed several private variables used to store public ↵ | Dan Lake | 2012-03-01 | 1 | -108/+44 |
| | | | | | | | | | parameters. They were only used by the get/set and make code harder to refactor. | ||||
| | * | Try to resolve some problems with viewers crashing after hitting parcel ↵ | Justin Clark-Casey (justincc) | 2012-02-23 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822 | ||||
| * | | 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 | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |