| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-04 | 3 | -6/+23 |
| |\ | | | | | | | careminster | ||||
| | * | Make llSetKeyframedMotion prims waut at the borders of down sims and try again | Melanie | 2012-02-26 | 1 | -0/+6 |
| | | | | | | | | | periodically. | ||||
| | * | Move KeyframeMotion from SOG to SOP because we can't persist it any | Melanie | 2012-02-26 | 1 | -3/+3 |
| | | | | | | | | | other way because SOG doesn't technically exist in the DB | ||||
| | * | Zero force and torque on take so that items don't run away when rezzed | Melanie | 2012-02-26 | 1 | -0/+2 |
| | | | |||||
| | * | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. | Melanie | 2012-02-26 | 2 | -1/+5 |
| | | | |||||
| | * | Delay the sending of the initial werables update until the inventory and | Melanie | 2012-02-25 | 1 | -6/+11 |
| | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-03 | 3 | -18/+27 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Send the right name and creation date on the BasicProfileModule. | Diva Canto | 2012-03-01 | 1 | -2/+11 |
| | | | | |||||
| | * | | Fixed two typos. White space cleanups. | Kevin Cozens | 2012-02-28 | 1 | -16/+16 |
| | | | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | * | | HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵ | Diva Canto | 2012-02-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | there. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-25 | 1 | -3/+0 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | ||||
| | * | | Remove EXPERIMENTAL tags from load iar/save iar commands. | Justin Clark-Casey (justincc) | 2012-02-25 | 1 | -3/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-02-24 | 2 | -1/+2 |
| |\ \ \ | |/ / | | / | |/ |/| | |||||
| | * | Stop spurious scene loop startup timeout alarms for scenes with many prims. | Justin Clark-Casey (justincc) | 2012-02-24 | 2 | -1/+2 |
| | | | | | | | | | | | | | | | | | 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 | 1 | -6/+21 |
| | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 3 | -14/+11 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 3 | -11/+10 |
| | | | | | | | | | | | | | 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. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-21 | 1 | -19/+3 |
| |\ \ | |/ | |||||
| | * | Fix problem with dragging child part inventory item to user inventory. | Justin Clark-Casey (justincc) | 2012-02-21 | 1 | -19/+3 |
| | | | | | | | | | | | 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 | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-02-20 | 1 | -1/+3 |
| |\ \ | |/ | |||||
| | * | One more tweak related to the previous 2 commits. | Diva Canto | 2012-02-19 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 1 | -5/+8 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 1 | -5/+8 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-02-19 | 1 | -1/+2 |
| | | |\ | |||||
| | | * | | A few more tweaks on position updates and create child agents. Mono hates ↵ | Diva Canto | 2012-02-19 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | 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 'ubitwork' | Melanie | 2012-02-19 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | ||||
| | * | | | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 1 | -15/+18 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-15 | 4 | -119/+90 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-02-10 | 1 | -1/+16 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml | ||||
| | * | | | | | | initial introdution of physics actor building control. | UbitUmarov | 2012-02-08 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2012-02-19 | 6 | -4/+185 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-19 | 3 | -3/+42 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | | * | | | | | Fix:Fly setting for Parcel dosen't work ↵ | PixelTomsen | 2012-02-19 | 1 | -1/+2 |
| | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5887 Signed-off-by: nebadon <michael@osgrid.org> | ||||
| | | * | | | | This should smooth movement in heteregeneous networks by a lot: cache the ↵ | Diva Canto | 2012-02-18 | 2 | -2/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | region by position instead of looking it up all the time -- this was being done during the main update loop! | ||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 3 | -1/+143 |
| | |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | ||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-02-17 | 2 | -1/+139 |
| | | |\ \ \ | |||||
| | | | * | | | minor formatting changes from last commit (4486n7d) | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -4/+3 |
| | | | | | | | |||||
| | | | * | | | Fix: Object owned by the group does not return to the last owner ↵ | PixelTomsen | 2012-02-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5404 | ||||
| | | | * | | | Turn off logging on test in last commit (2b84295). | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | | | * | | | If shape properties fail SOP parsing (e.g. due to commas instead of decimal ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -0/+133 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | points) print out one short message listing the failing node names rather than lots of exceptions. Adds skeleton bad float values deserialization test | ||||
| | | * | | | | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by ↵ | Dan Lake | 2012-02-17 | 1 | -0/+4 |
| | | |/ / / | | | | | | | | | | | | | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set). | ||||
| * | | | | | try to make crossings work better. chode no longer prevents crossings i hope | UbitUmarov | 2012-02-15 | 1 | -15/+18 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-02-15 | 1 | -107/+43 |
| |\ \ \ \ | | | | | | | | | | | | | | | | careminster | ||||
| | * | | | | Implement region crossing of sitting avatars. Edit mode and llSetPos work | Melanie | 2012-02-14 | 1 | -102/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | but unscripted default sit anim is lost. Still some Gfx glitching. Physical crossing doesn't work yet. | ||||
| | * | | | | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | crossings | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-15 | 2 | -10/+37 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | Refactor appearance saving for NPC to use AvatarFactoryModule interface. | Dan Lake | 2012-02-14 | 1 | -9/+31 |
| | | | | | |||||
| | * | | | short circuit the expensive parts of the permission checking code | Mic Bowman | 2012-02-13 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | if the current user is the owner of an object. none of the later checks can reverse the outcome. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-02-10 | 1 | -2/+10 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| | * | | Fix bug where somebody taking a copy of an object they didn't own that was ↵ | Justin Clark-Casey (justincc) | 2012-02-10 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825 | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |