aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-251-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-251-3/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-02-242-1/+2
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-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-231-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 careminsterMelanie2012-02-233-14/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-233-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 careminsterMelanie2012-02-211-19/+3
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-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 careminsterMelanie2012-02-201-1/+3
|\ \ | |/
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-5/+8
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-5/+8
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-191-1/+2
| | |\
| | * | A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-191-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'Melanie2012-02-191-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 hopeUbitUmarov2012-02-151-15/+18
| | | | |
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-154-119/+90
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-101-1/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: prebuild.xml
| * | | | | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-196-4/+185
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' into careminsterMelanie2012-02-193-3/+42
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Fix:Fly setting for Parcel dosen't work ↵PixelTomsen2012-02-191-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 Canto2012-02-182-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 careminsterMelanie2012-02-183-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/opensimDan Lake2012-02-172-1/+139
| | |\ \ \
| | | * | | minor formatting changes from last commit (4486n7d)Justin Clark-Casey (justincc)2012-02-161-4/+3
| | | | | |
| | | * | | Fix: Object owned by the group does not return to the last owner ↵PixelTomsen2012-02-161-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-161-1/+1
| | | | | |
| | | * | | If shape properties fail SOP parsing (e.g. due to commas instead of decimal ↵Justin Clark-Casey (justincc)2012-02-161-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 Lake2012-02-171-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 hopeUbitUmarov2012-02-151-15/+18
|/ / / /
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-02-151-107/+43
|\ \ \ \ | | | | | | | | | | | | | | | careminster
| * | | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-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 simMelanie2012-02-141-5/+5
| | | | | | | | | | | | | | | | | | | | crossings
* | | | | Merge branch 'master' into careminsterMelanie2012-02-152-10/+37
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-9/+31
| | | |
| * | | short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-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 careminsterMelanie2012-02-101-2/+10
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-101-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
* | | Merge branch 'master' into careminsterMelanie2012-02-101-1/+16
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-101-4/+15
| | | | | | | | | | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
* | Merge branch 'master' into careminsterMelanie2012-02-052-3/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| | | | | | | | | | is to only write to the database if data was changed. I was writing to the db on every step of every avatar. Sure to give us lag, that.
| * Revert "Remove checks on ban list expiry on every move. To be re-added on ↵Melanie2012-02-051-4/+4
| | | | | | | | | | | | parcel" This reverts commit 35f14a262dfa3d9199f554154a63f5f532460f56.
| * Revert "Check ban list for a particular parcel only when an avatar moves ↵Melanie2012-02-052-17/+4
| | | | | | | | | | | | into it." This reverts commit 8923ad755d97d5ddb4a29cb6f543b53195f0b461.
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| | | | | | | | | | This restores functionality remove in the last commit without reintroducing the performance penalty.
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| | | | | | | | | | boundary crossing only as soon as I'm properly awake. This should fix recent performance issues
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-02-044-8/+10
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
generated by cgit v1.1 at 2024-12-25 00:24:48 +0000