| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | 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. | |||||
| | | * | Amend to last commit. This should have been committed too. | Diva Canto | 2012-02-19 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Make vehicles retain velocity when crossing between regions. | Melanie | 2012-02-20 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Add an override to make SOG.Velocity work as expected | Melanie | 2012-02-20 | 1 | -0/+6 | |
| |/ / | ||||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 3 | -13/+21 | |
| |\ \ | ||||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 3 | -13/+21 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 2 | -9/+9 | |
| | | |\ | ||||||
| | | | * | Use localy defined name, TPFlags, for Constants.TeleportFlags | BlueWall | 2012-02-19 | 1 | -6/+6 | |
| | | | | | ||||||
| | | * | | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 2 | -7/+15 | |
| | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | Uncomment serialization | Melanie | 2012-02-19 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 3 | -4/+300 | |
| |\ \ \ \ | ||||||
| | * | | | | simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs | UbitUmarov | 2012-02-19 | 1 | -77/+117 | |
| | | | | | | ||||||
| | * | | | | Vehicle XML serialization more complete. Inactived by coments in ↵ | UbitUmarov | 2012-02-19 | 3 | -4/+260 | |
| | | | | | | | | | | | | | | | | | | | | | SceneObjectSerializar.cs until proper testing | |||||
| * | | | | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 5 | -26/+636 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | |||||
| | * | | | | moved vehicle from SOG to SOP | UbitUmarov | 2012-02-19 | 3 | -104/+79 | |
| | | | | | | ||||||
| | * | | | | missing paramenters init plus some cleaning | UbitUmarov | 2012-02-18 | 1 | -91/+16 | |
| | | | | | | ||||||
| | * | | | | added a EnUsCulture whatever that is.. | UbitUmarov | 2012-02-18 | 1 | -4/+3 | |
| | | | | | | ||||||
| | * | | | | a bit less human readable xml | UbitUmarov | 2012-02-18 | 1 | -25/+25 | |
| | | | | | | ||||||
| | * | | | | added some ToXml2 to SOGVehicle ( unused untested ) | UbitUmarov | 2012-02-18 | 1 | -1/+84 | |
| | | | | | | ||||||
| | * | | | | changed how vehicle data is stored and passed to physics. use unsafe in ↵ | UbitUmarov | 2012-02-18 | 2 | -163/+175 | |
| | | | | | | | | | | | | | | | | | | | | | serializer, tried to control m_dupeInProgress | |||||
| | * | | | | vehicle parameters do cross (i hope) on regions in same instance ( others ↵ | UbitUmarov | 2012-02-18 | 2 | -13/+57 | |
| | | | | | | | | | | | | | | | | | | | | | need xml) | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |