aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-151-0/+33
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-125-415/+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
| * | | | Completely remove the IRegionModule interfaceMelanie2012-11-121-55/+0
| | | | |
| * | | | Stop closing old style modulesMelanie2012-11-121-9/+0
| | | | |
| * | | | Remove the old style module loader and all references to itMelanie2012-11-124-350/+12
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-121-36/+78
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | | | document & 80-character width terminal formattingSignpostMarv2012-11-111-36/+78
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | | Merge branch 'master' into careminsterMelanie2012-11-111-0/+33
|\ \ \ \ \ | |/ / / /
| * | | | moving windlight-sources to correct namespace-named folder (world); add ↵PixelTomsen2012-11-111-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LightShare as Interface Signed-off-by: Diva Canto <diva@metaverseink.com>
* | | | | Merge branch 'master' into careminsterMelanie2012-11-116-94/+174
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * | | | One more module converted: CloudModule.Diva Canto2012-11-101-1/+1
| | | | |
| * | | | 80 character-width terminal formatting of IDialogModule interface, removing ↵SignpostMarv2012-11-101-23/+28
| | | | | | | | | | | | | | | | | | | | superfluous whitespace & line-endings.
| * | | | Documenting parameters of methods on the IDialogModule interfaceSignpostMarv2012-11-101-33/+73
| | | | |
| * | | | 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()
| * | | | Converted the WindModule to the new region module interface (38 to go). Also ↵Diva Canto2012-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | added both the WindModule and the SunModule to the Plugin manifest.
| * | | | Converted the SunModule to the new region module interface. (39 to go...)Diva Canto2012-11-091-1/+1
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-11-091-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | marking IRegionModule interface as obsolete via System.ObsoleteAttribute, ↵SignpostMarv2012-11-091-0/+2
| | | | | | | | | | | | | | | | | | | | intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time.
| * | | | Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-041-0/+2
| | | | | | | | | | | | | | | | | | | | script engines to use them.
* | | | | Merge branch 'avination' into careminsterMelanie2012-11-044-2/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Add a method to query all registered script constants to allow non-XEngineMelanie2012-11-041-0/+2
| | | | | | | | | | | | | | | | | | | | script engines to use them.
| * | | | 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-312-14/+48
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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-312-17/+48
| | | | | | | | | | | | | | | | | | | | 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-304-158/+95
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs