aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-091-2/+5
|\
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-2/+5
| |\
| | * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-021-2/+11
| | |\
| | * | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* | | | Merge branch 'master' into careminsterMelanie2012-03-0815-82/+58
|\ \ \ \ | |/ / /
| * | | Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | |
| * | | Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-081-40/+7
| | | | | | | | | | | | | | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
| * | | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-0815-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | | | Merge branch 'master' into careminsterMelanie2012-03-072-24/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| | | | | | | | | | | | | | | | | | | | I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case. Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
| * | | Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-061-0/+20
| | |/ | |/| | | | | | | | | | | | | status" command. This is for diagnostic purposes.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-043-6/+23
|\ \ \ | | | | | | | | | | | | careminster
| * | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+6
| | | | | | | | | | | | | | | | periodically.
| * | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-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 rezzedMelanie2012-02-261-0/+2
| | | |
| * | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-262-1/+5
| | | |
| * | | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-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 careminsterMelanie2012-03-033-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 Canto2012-03-011-2/+11
| | |/ | |/|
| * | Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵Diva Canto2012-02-251-1/+1
| | | | | | | | | | | | there.
* | | 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
| | | | | |
generated by cgit v1.1 at 2025-01-23 05:29:31 +0000