Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 5 | -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 interface | Melanie | 2012-11-12 | 1 | -55/+0 | |
| | | | | | ||||||
| * | | | | Stop closing old style modules | Melanie | 2012-11-12 | 1 | -9/+0 | |
| | | | | | ||||||
| * | | | | Remove the old style module loader and all references to it | Melanie | 2012-11-12 | 4 | -350/+12 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 1 | -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 formatting | SignpostMarv | 2012-11-11 | 1 | -36/+78 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Diva Canto <diva@metaverseink.com> | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 1 | -0/+33 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | moving windlight-sources to correct namespace-named folder (world); add ↵ | PixelTomsen | 2012-11-11 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LightShare as Interface Signed-off-by: Diva Canto <diva@metaverseink.com> | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 6 | -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 Canto | 2012-11-10 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | 80 character-width terminal formatting of IDialogModule interface, removing ↵ | SignpostMarv | 2012-11-10 | 1 | -23/+28 | |
| | | | | | | | | | | | | | | | | | | | | superfluous whitespace & line-endings. | |||||
| * | | | | Documenting parameters of methods on the IDialogModule interface | SignpostMarv | 2012-11-10 | 1 | -33/+73 | |
| | | | | | ||||||
| * | | | | Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() ↵ | Justin Clark-Casey (justincc) | 2012-11-10 | 2 | -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 Canto | 2012-11-09 | 1 | -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 Canto | 2012-11-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-09 | 1 | -0/+2 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | marking IRegionModule interface as obsolete via System.ObsoleteAttribute, ↵ | SignpostMarv | 2012-11-09 | 1 | -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-XEngine | Melanie | 2012-11-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | script engines to use them. | |||||
* | | | | | Merge branch 'avination' into careminster | Melanie | 2012-11-04 | 4 | -2/+13 | |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | | Add a method to query all registered script constants to allow non-XEngine | Melanie | 2012-11-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | script engines to use them. | |||||
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-11-01 | 2 | -1/+11 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | more debug | UbitUmarov | 2012-10-28 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | remove pre physics build testing | UbitUmarov | 2012-10-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add some extra debug on scene close | UbitUmarov | 2012-10-28 | 1 | -1/+9 | |
| | | | | | ||||||
| * | | | | Make sure we're not accessing a physics scene if we're not in one yet. | Melanie | 2012-10-30 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 1 | -3/+3 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Change to earlier commit for TargetVelocity to support distributed physics. | Dan Lake | 2012-11-02 | 1 | -3/+3 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-11-01 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Add TargetVelocity to PhysicsActor interface to support distributed physics. ↵ | Dan Lake | 2012-10-31 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | No change to existing functions. | |||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-10-31 | 2 | -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-31 | 2 | -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 careminster | Melanie | 2012-10-31 | 3 | -6/+24 | |
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-30 | 1 | -5/+9 | |
| |\ \ \ | ||||||
| | * | | | Only create a new list to check if objects have reached targets if there ↵ | Justin Clark-Casey (justincc) | 2012-10-30 | 1 | -5/+9 | |
| | | | | | | | | | | | | | | | | | | | | actually are any targets. | |||||
| * | | | | Store and send the current movement animation state to a new sim on crossing | Melanie | 2012-10-30 | 2 | -0/+17 | |
| |/ / / | ||||||
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-10-30 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Set the script state to new rez when a scriptis saved, rather than region start. | Melanie | 2012-10-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Prevents CHANGED_REGION_RESTART being sent to scripts when saving. | |||||
* | | | | Put back the collision sound shim into SOP | Melanie | 2012-10-30 | 1 | -0/+29 | |
| | | | | ||||||
* | | | | Merge branch 'master' into careminster | Melanie | 2012-10-30 | 4 | -158/+95 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | | | documenting some params on ISoundModule methods | SignpostMarv | 2012-10-29 | 1 | -7/+16 | |
| | | | | ||||||
| * | | | Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the ↵ | SignpostMarv | 2012-10-29 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint | |||||
| * | | | shuffling code around so that the interface for ISoundModule.SendSound() ↵ | SignpostMarv | 2012-10-29 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | specifies a UUID rather than a string | |||||
| * | | | moving SendSound from SceneObjectPart to ISoundModule | SignpostMarv | 2012-10-29 | 2 | -79/+24 | |
| | | | | ||||||
| * | | | fixing a bug in SceneObjectPart.SendSound where sounds would always come ↵ | SignpostMarv | 2012-10-29 | 1 | -9/+8 | |
| | | | | | | | | | | | | | | | | from the root prim rather than the source prim | |||||
| * | | | Factoring out a superfluous local variable & repeated assignment in ↵ | SignpostMarv | 2012-10-29 | 1 | -10/+8 | |
| | | | | | | | | | | | | | | | | SceneObjectPart.SendSound as linksets are only meant to have a single owner | |||||
| * | | | deduplicating code into a single LoopSound method | SignpostMarv | 2012-10-29 | 1 | -4/+5 | |
| | | | | ||||||
| * | | | removing superfluous lines from SceneObjectPart.SendSound | SignpostMarv | 2012-10-29 | 1 | -8/+0 | |
| | | | | ||||||
| * | | | adjusting parameter order of PreloadSound to be more logical | SignpostMarv | 2012-10-29 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | transposing LoopSoundMaster to Sound Module | SignpostMarv | 2012-10-29 | 1 | -0/+11 | |
| | | | | ||||||
| * | | | transposing preload sound onto sound module | SignpostMarv | 2012-10-29 | 2 | -31/+10 | |
| | | | |