| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-06 | 1 | -3/+10 | |
| |\ \ \ \ | |/ / / | | | | | | | | | careminster | |||||
| | * | | | A stab at making llEjectFromLand work in all cases | Melanie | 2012-03-05 | 1 | -3/+10 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-04 | 7 | -42/+592 | |
| |\ \ \ \ | |/ / / | | | | | | | | | careminster | |||||
| | * | | | Zero velocity when drag-copying | Melanie | 2012-03-04 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | Fix vehicles going physical stopping llTargetOmega parts (boat radar) | Melanie | 2012-02-27 | 1 | -3/+5 | |
| | | | | | ||||||
| | * | | | Make llSetKeyframedMotion prims waut at the borders of down sims and try again | Melanie | 2012-02-26 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | periodically. | |||||
| | * | | | Move KeyframeMotion from SOG to SOP because we can't persist it any | Melanie | 2012-02-26 | 5 | -25/+38 | |
| | | | | | | | | | | | | | | | | | other way because SOG doesn't technically exist in the DB | |||||
| | * | | | Implement proper selection behavior | Melanie | 2012-02-26 | 3 | -2/+37 | |
| | | | | | ||||||
| | * | | | Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new | Melanie | 2012-02-26 | 4 | -9/+7 | |
| | | | | | | | | | | | | | | | | | code. | |||||
| | * | | | Fix an infinite recursion caused by checking the wrong values for | Melanie | 2012-02-26 | 1 | -24/+27 | |
| | | | | | | | | | | | | | | | | | Buoyancy, Force and Torque | |||||
| | * | | | Serialize Keyframe motion for region crossings | Melanie | 2012-02-26 | 4 | -4/+96 | |
| | | | | | ||||||
| | * | | | Merge branch 'ubitwork' | Melanie | 2012-02-26 | 3 | -35/+98 | |
| | |\ \ \ | ||||||
| | | * | | | changed SOP Force and Torque, adding XML (de/)serialization, also changed ↵ | UbitUmarov | 2012-02-25 | 3 | -35/+98 | |
| | | | | | | | | | | | | | | | | | | | | | Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual) | |||||
| | * | | | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. | Melanie | 2012-02-26 | 3 | -0/+330 | |
| | |/ / / | ||||||
| | * | | | 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. | |||||
| | * | | | Prevent a nullref when nonphysical motion objects cross sim boundaries | Melanie | 2012-02-23 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 3 | -98/+28 | |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | Remove outdated comment about checking attachment prims in ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript() | |||||
| | * | | | Allow a script to receive events if its root prim is in an area where it's ↵ | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -4/+1 | |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion! | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-02 | 1 | -2/+1 | |
| | |\ \ | ||||||
| | | * | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2012-03-02 | 1 | -2/+1 | |
| | | | | | ||||||
| | * | | | 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. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-24 | 2 | -22/+12 | |
| |\ \ \ | |/ / | | / | |/ |/| | ||||||
| | * | Take watchdog alarm calling back outside the m_threads lock. | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -2/+2 | |
| | | | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem. | |||||
| | * | Get rid of some of the identical exception catching in Scene.Update(). | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -17/+1 | |
| | | | ||||||
| | * | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 1 | -3/+9 | |
| | | | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout. | |||||
| | * | Try to resolve some problems with viewers crashing after hitting parcel ↵ | Justin Clark-Casey (justincc) | 2012-02-23 | 2 | -10/+20 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+9 | |
| | | | ||||||
| * | | 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 | 2 | -10/+7 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-23 | 1 | -8/+2 | |
| | |\ | ||||||
| | | * | Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵ | Justin Clark-Casey (justincc) | 2012-02-22 | 1 | -8/+2 | |
| | | | | | | | | | | | | | constructor and never subsequent set to null. | |||||
| | * | | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 2 | -2/+5 | |
| | |/ | | | | | | | | | | | 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-21 | 1 | -0/+9 | |
| |\ \ | |/ | ||||||
| | * | Restore the taskItem null check that I accidentally blatted in 5397a6d | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -0/+9 | |
| | | | | | | | | | This is a valid check because the caller could supply an invalid uuid. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -16/+2 | |
| |\ \ | |/ | ||||||
| | * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -11/+1 | |
| | | | | | | | | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569 | |||||
| | * | Revert "Fix:Cannot drag inventory from child prim into inventory ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -8/+4 | |
| | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way. | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -4/+8 | |
| |\ \ | |/ | ||||||
| | * | Fix:Cannot drag inventory from child prim into inventory ↵ | PixelTomsen | 2012-02-21 | 1 | -4/+8 | |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5569 | |||||
| * | | Also preserve angular velocity on crossing. | Melanie | 2012-02-21 | 1 | -0/+3 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -15/+14 | |
| |\ \ | |/ | | | | | Conflicts: | |||||
| | * | Fix bug where NPCs would establish child agents on other neighbour regions ↵ | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -15/+14 | |
| | | | | | | | | | that had come up after the NPC was created. | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-20 | 2 | -6/+3 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 2 | -6/+3 | |
| | |\ \ | | |/ | ||||||
| | | * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -5/+2 | |
| | | | | | | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |