aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-301-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * ScenePresence passes the avatar rotation down to the physics engine. This ↵Robert Adams2012-12-281-0/+4
| | | | | | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
* | Merge branch 'master' into careminsterMelanie2012-12-281-3/+8
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Add check to always push terse updates for presences that have new ↵Robert Adams2012-12-271-3/+8
| | | | | | | | velocities of zero.
* | Merge branch 'avination' into careminsterMelanie2012-12-211-0/+19
|\ \
| * | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-212-6/+15
|\ \ \ | | |/ | |/|
| * | Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵Robert Adams2012-12-182-6/+15
| | | | | | | | | | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
* | | Merge branch 'avination' into careminsterMelanie2012-12-182-184/+123
|\ \ \ | | |/ | |/|
| * | Fix locking for goodMelanie2012-12-181-3/+3
| | |
| * | Merge branch 'ubitwork' into avinationMelanie2012-12-171-174/+48
| |\ \
| | * | * TEST * unscripted sitUbitUmarov2012-12-171-174/+48
| | | |
| * | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-12-171-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avination Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | | * Fix for Prim Locking. Prior to the merge, it was just a clone of the ↵teravus2012-12-151-4/+4
| | |/ / | | | | | | | | | | | | root part to each of the child parts.
| * | | Fix locking objectsMelanie2012-12-161-1/+3
| |/ /
| * | right fix this time ??UbitUmarov2012-12-131-1/+1
| | |
| * | fix the 'fix'UbitUmarov2012-12-131-2/+2
| | |
| * | fix coment out code not in useUbitUmarov2012-12-131-2/+2
| | |
| * | FIX small avatars movement on terrain. (avatar appearance getting evenUbitUmarov2012-12-131-4/+36
| | | | | | | | | | | | more messy)
| * | add some default size setting and checksUbitUmarov2012-12-071-1/+2
| | |
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-2/+2
| | | | | | | | | | | | since at least for now seems good enought
| * | create a new ode character also with the new informationUbitUmarov2012-12-071-0/+6
| | |
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-0/+6
| | |
| * | avatar collision plane send to viewer is only relative to feet. changeUbitUmarov2012-12-051-4/+11
| | | | | | | | | | | | avatar collider, just rounding the boxes, etc
| * | *TEST* diferent avatar colliderUbitUmarov2012-12-031-2/+13
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-181-5/+13
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * | BulletSim: experimentally remove unit displacement from prim border crossing ↵Robert Adams2012-12-161-2/+13
| | | | | | | | | | | | test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
* | | Merge branch 'master' into careminsterMelanie2012-12-165-41/+66
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | minor: If the physics module tells us that an object has gone out of bounds, ↵Justin Clark-Casey (justincc)2012-12-151-2/+5
| | | | | | | | | | | | more helpfully log the name, id, position and region of that object.
| * | minor: Add commented out log lines to ScenePresenceAnimator for future debug ↵Justin Clark-Casey (justincc)2012-12-141-1/+10
| | | | | | | | | | | | use (such as logging anim pack contents sent to clients)
| * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ↵Justin Clark-Casey (justincc)2012-12-142-2/+42
| | | | | | | | | | | | | | | | | | | | | causing subsequent issues if physics was re-enabled. Added regression tests Addresses http://opensimulator.org/mantis/view.php?id=6365
| * | Simplify sit code a bit by determining correct animation in HandleSit ↵Dan Lake2012-12-131-30/+6
| | | | | | | | | | | | instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
| * | Switched the order by which foreign inventory and foreign assets are brought ↵Diva Canto2012-12-091-6/+4
| | | | | | | | | | | | in, to avoid race conditions on the client.
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
| | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now.
* | | Merge branch 'master' into careminsterMelanie2012-12-072-5/+14
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ↵Justin Clark-Casey (justincc)2012-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aim of avoiding OpenSimulator problems due to script thread aborts. When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long. However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state. One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it. This is probably the same problem as encountered originally in commit 12cebb12 This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
| * | minor: Put Scene.PhysicsRequestAsset() into standard C# xml format.Justin Clark-Casey (justincc)2012-12-041-4/+11
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-041-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * | XmlRpcGridRouterBlueWall2012-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called. See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or https://github.com/BlueWall/XmlRpcRouter for php gateway and test code.
* | | Merge branch 'master' into careminsterMelanie2012-11-2519-120/+107
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ↵Justin Clark-Casey (justincc)2012-11-243-106/+83
| | | | | | | | | | | | functionally identical. Move TestDeleteSceneObjectAsync() and TestDeleteSceneObjectAsyncToUserInventory() from SceneObjectBasicTests -> SceneObjectDeRezTests
| * Fix regression TestDeleteSceneObjectAsyncToUserInventory by adding a ↵Justin Clark-Casey (justincc)2012-11-241-7/+12
| | | | | | | | BasicInventoryAccessModule() and re-enable in test suite.
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-2417-17/+17
| | | | | | | | automatically turns off any logging enabled between tests
| * minor: Make note in log if scene was restarted due to an unrecoverable ↵Justin Clark-Casey (justincc)2012-11-231-1/+6
| | | | | | | | physics error
* | Merge branch 'master' into careminsterMelanie2012-11-233-19/+81
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * Fix problem where restarting the currently selected region would stop ↵Justin Clark-Casey (justincc)2012-11-232-31/+25
| | | | | | | | | | | | various console commands (e.g. "show users") from working. This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
| * Add regression test for checking scene close when SceneManager is asked to closeJustin Clark-Casey (justincc)2012-11-231-0/+58
| |
* | Fix a build break introduced by us having a more efficient DoubleDictionaryMelanie2012-11-231-4/+8
| | | | | | | | where core has a simple list
* | Merge branch 'master' into careminsterMelanie2012-11-231-0/+7
|\ \ | |/
| * Fix regression where we stopped closing scenes on simulator exit.Justin Clark-Casey (justincc)2012-11-231-0/+7
| | | | | | | | | | If we don't do this, then these scenes don't get deregistered from the grid, amongst other things. Regression was introduced in commit 8c130bc (Mon Nov 12 22:50:28 2012 +0000)
generated by cgit v1.1 at 2024-09-12 16:51:17 +0000