aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-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)
* | Merge branch 'master' into careminsterMelanie2012-11-201-3/+20
|\ \ | |/
| * Minor formatting for 0962a35d and a few one-line comments as to why that ↵Justin Clark-Casey (justincc)2012-11-201-8/+7
| | | | | | | | code is there
| * Fix movetotarget on mega regions.Iain Oliver2012-11-201-3/+21
| |
* | Merge branch 'avination' into careminsterMelanie2012-11-173-5/+28
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-11-061-5/+10
| |\ \
| | * | actually remove the use of random on persist timmingsUbitUmarov2012-11-021-4/+6
| | | |
| | * | Create a new random when needed using normal time based seed instead ofUbitUmarov2012-11-021-2/+5
| | | | | | | | | | | | | | | | reusing a shared one than may not be valid
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-305-16/+55
| | |\ \
| * | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵teravus2012-11-042-0/+18
| | | | | | | | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
* | | | | Merge branch 'master' into careminsterMelanie2012-11-123-97/+12
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | | | Stop closing old style modulesMelanie2012-11-121-9/+0
| | | | |
| * | | | Remove the old style module loader and all references to itMelanie2012-11-123-88/+12
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-112-35/+70
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | | | Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() ↵Justin Clark-Casey (justincc)2012-11-102-35/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and make it compile again Not currently in test suite since not yet working. Also add method doc to Scene.DeRezObjects()
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-043-2/+11
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Merge branch 'ubitwork' into avinationMelanie2012-11-012-1/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | more debugUbitUmarov2012-10-281-0/+2
| | | | |
| | * | | remove pre physics build testingUbitUmarov2012-10-281-1/+1
| | | | |
| | * | | Add some extra debug on scene closeUbitUmarov2012-10-281-1/+9
| | | | |
| * | | | Make sure we're not accessing a physics scene if we're not in one yet.Melanie2012-10-301-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-11-031-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Change to earlier commit for TargetVelocity to support distributed physics.Dan Lake2012-11-021-3/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-11-011-1/+1
|\ \ \ \ | |/ / /
| * | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵Dan Lake2012-10-311-1/+1
| | | | | | | | | | | | | | | | No change to existing functions.
* | | | Merge branch 'master' into careminsterMelanie2012-10-311-14/+35
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * | | Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-17/+35
| | | | | | | | | | | | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
* | | | Merge branch 'master' into careminsterMelanie2012-10-313-6/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-301-5/+9
| |\ \ \
| | * | | Only create a new list to check if objects have reached targets if there ↵Justin Clark-Casey (justincc)2012-10-301-5/+9
| | | | | | | | | | | | | | | | | | | | actually are any targets.
| * | | | Store and send the current movement animation state to a new sim on crossingMelanie2012-10-302-0/+17
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
| | | | | | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
* | | | Put back the collision sound shim into SOPMelanie2012-10-301-0/+29
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-10-303-155/+5
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | shuffling code around so that the interface for ISoundModule.SendSound() ↵SignpostMarv2012-10-291-1/+1
| | | | | | | | | | | | | | | | specifies a UUID rather than a string
| * | | moving SendSound from SceneObjectPart to ISoundModuleSignpostMarv2012-10-291-79/+9
| | | |
| * | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵SignpostMarv2012-10-291-9/+8
| | | | | | | | | | | | | | | | from the root prim rather than the source prim
| * | | Factoring out a superfluous local variable & repeated assignment in ↵SignpostMarv2012-10-291-10/+8
| | | | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner